diff --git a/go.mod b/go.mod index 02bac1fee..e68db5bd3 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/go-bindata/go-bindata/v3 v3.1.3 github.com/golang-migrate/migrate/v4 v4.14.1 github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe - github.com/golang/protobuf v1.5.1 + github.com/golang/protobuf v1.5.2 github.com/google/go-cmp v0.5.5 github.com/grpc-ecosystem/grpc-gateway/v2 v2.3.0 github.com/hashicorp/boundary/api v0.0.9 @@ -57,7 +57,7 @@ require ( golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d golang.org/x/tools v0.1.0 google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6 - google.golang.org/grpc v1.36.0 + google.golang.org/grpc v1.37.0 google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0 google.golang.org/protobuf v1.26.0 mvdan.cc/gofumpt v0.1.1 diff --git a/go.sum b/go.sum index a942d9bde..40019cc83 100644 --- a/go.sum +++ b/go.sum @@ -259,6 +259,7 @@ github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymF github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5 h1:Yzb9+7DPaBjB8zlTR87/ElzFsnQfuHnVUVqpZZIcV5Y= github.com/erikstmartin/go-testdb v0.0.0-20160219214506-8d10e4a1bae5/go.mod h1:a2zkGnVExMxdzMo3M0Hi/3sEU+cWnZpSni0O6/Yb/P0= @@ -371,8 +372,8 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.1 h1:jAbXjIeW2ZSW2AwFxlGTDoc2CjI2XujLkV3ArsZFCvc= -github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20170215233205-553a64147049/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= @@ -1365,8 +1366,9 @@ google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTp google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.35.0-dev.0.20201218190559-666aea1fb34c/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As= google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.0 h1:uSZWeQJX5j11bIQ4AJoj+McDBo29cY1MCoC1wO3ts+c= +google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.0.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= 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= diff --git a/internal/auth/oidc/request/request.pb.go b/internal/auth/oidc/request/request.pb.go index 99cb7565c..238f7beed 100644 --- a/internal/auth/oidc/request/request.pb.go +++ b/internal/auth/oidc/request/request.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/auth/oidc/request/v1/request.proto // Package store provides protobufs for storing types in the password package. @@ -9,11 +9,11 @@ package request import ( - _ "github.com/golang/protobuf/ptypes/wrappers" timestamp "github.com/hashicorp/boundary/internal/db/timestamp" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) diff --git a/internal/auth/oidc/store/oidc.pb.go b/internal/auth/oidc/store/oidc.pb.go index d011fd1e9..4884104db 100644 --- a/internal/auth/oidc/store/oidc.pb.go +++ b/internal/auth/oidc/store/oidc.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/auth/oidc/store/v1/oidc.proto // Package store provides protobufs for storing types in the password package. @@ -9,11 +9,11 @@ package store import ( - _ "github.com/golang/protobuf/ptypes/wrappers" timestamp "github.com/hashicorp/boundary/internal/db/timestamp" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) diff --git a/internal/auth/password/store/argon2.pb.go b/internal/auth/password/store/argon2.pb.go index db5f088ff..05dbbae6e 100644 --- a/internal/auth/password/store/argon2.pb.go +++ b/internal/auth/password/store/argon2.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/auth/password/store/v1/argon2.proto // Package store provides protobufs for storing types in the password package. diff --git a/internal/auth/password/store/password.pb.go b/internal/auth/password/store/password.pb.go index fd523ec71..8d6a938a6 100644 --- a/internal/auth/password/store/password.pb.go +++ b/internal/auth/password/store/password.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/auth/password/store/v1/password.proto // Package store provides protobufs for storing types in the password package. diff --git a/internal/auth/store/account.pb.go b/internal/auth/store/account.pb.go index 331e5355e..75b18e9fa 100644 --- a/internal/auth/store/account.pb.go +++ b/internal/auth/store/account.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/auth/store/v1/account.proto package store diff --git a/internal/auth/store/auth_method.pb.go b/internal/auth/store/auth_method.pb.go index 1a17f82c0..df7e40489 100644 --- a/internal/auth/store/auth_method.pb.go +++ b/internal/auth/store/auth_method.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/auth/store/v1/auth_method.proto package store diff --git a/internal/authtoken/store/authtoken.pb.go b/internal/authtoken/store/authtoken.pb.go index 129df2c36..1fa440809 100644 --- a/internal/authtoken/store/authtoken.pb.go +++ b/internal/authtoken/store/authtoken.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/authtoken/store/v1/authtoken.proto package store diff --git a/internal/db/db_test/db_test.pb.go b/internal/db/db_test/db_test.pb.go index ac0c5ef48..4038e752e 100644 --- a/internal/db/db_test/db_test.pb.go +++ b/internal/db/db_test/db_test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/db/db_test/v1/db_test.proto // define a test proto package for the internal/db package. These protos diff --git a/internal/db/timestamp/timestamp.pb.go b/internal/db/timestamp/timestamp.pb.go index 6f72bb5de..1fdae9b94 100644 --- a/internal/db/timestamp/timestamp.pb.go +++ b/internal/db/timestamp/timestamp.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/timestamp/v1/timestamp.proto package timestamp import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -31,7 +31,7 @@ type Timestamp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Timestamp *timestamp.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` + Timestamp *timestamppb.Timestamp `protobuf:"bytes,1,opt,name=timestamp,proto3" json:"timestamp,omitempty"` } func (x *Timestamp) Reset() { @@ -66,7 +66,7 @@ func (*Timestamp) Descriptor() ([]byte, []int) { return file_controller_storage_timestamp_v1_timestamp_proto_rawDescGZIP(), []int{0} } -func (x *Timestamp) GetTimestamp() *timestamp.Timestamp { +func (x *Timestamp) GetTimestamp() *timestamppb.Timestamp { if x != nil { return x.Timestamp } @@ -109,8 +109,8 @@ func file_controller_storage_timestamp_v1_timestamp_proto_rawDescGZIP() []byte { var file_controller_storage_timestamp_v1_timestamp_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_controller_storage_timestamp_v1_timestamp_proto_goTypes = []interface{}{ - (*Timestamp)(nil), // 0: controller.storage.timestamp.v1.Timestamp - (*timestamp.Timestamp)(nil), // 1: google.protobuf.Timestamp + (*Timestamp)(nil), // 0: controller.storage.timestamp.v1.Timestamp + (*timestamppb.Timestamp)(nil), // 1: google.protobuf.Timestamp } var file_controller_storage_timestamp_v1_timestamp_proto_depIdxs = []int32{ 1, // 0: controller.storage.timestamp.v1.Timestamp.timestamp:type_name -> google.protobuf.Timestamp diff --git a/internal/gen/controller/api/error.pb.go b/internal/gen/controller/api/error.pb.go index 42a4917c8..3004a7071 100644 --- a/internal/gen/controller/api/error.pb.go +++ b/internal/gen/controller/api/error.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/v1/error.proto package api diff --git a/internal/gen/controller/api/resources/accounts/account.pb.go b/internal/gen/controller/api/resources/accounts/account.pb.go index f29c54375..daaaaa991 100644 --- a/internal/gen/controller/api/resources/accounts/account.pb.go +++ b/internal/gen/controller/api/resources/accounts/account.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/accounts/v1/account.proto package accounts import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -36,13 +36,13 @@ type Account struct { // Output only. Scope information for the Account. Scope *scopes.ScopeInfo `protobuf:"bytes,20,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,30,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,30,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,40,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,50,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,50,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,70,opt,name=version,proto3" json:"version,omitempty"` @@ -51,7 +51,7 @@ type Account struct { // The ID of the Auth Method that is associated with this Account. AuthMethodId string `protobuf:"bytes,90,opt,name=auth_method_id,proto3" json:"auth_method_id,omitempty"` // The attributes that are applicable for the specific Account type. - Attributes *_struct.Struct `protobuf:"bytes,100,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,100,opt,name=attributes,proto3" json:"attributes,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` } @@ -102,28 +102,28 @@ func (x *Account) GetScope() *scopes.ScopeInfo { return nil } -func (x *Account) GetName() *wrappers.StringValue { +func (x *Account) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *Account) GetDescription() *wrappers.StringValue { +func (x *Account) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *Account) GetCreatedTime() *timestamp.Timestamp { +func (x *Account) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Account) GetUpdatedTime() *timestamp.Timestamp { +func (x *Account) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -151,7 +151,7 @@ func (x *Account) GetAuthMethodId() string { return "" } -func (x *Account) GetAttributes() *_struct.Struct { +func (x *Account) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -174,7 +174,7 @@ type PasswordAccountAttributes struct { // The login name of this Account. This is unique per Auth Method. LoginName string `protobuf:"bytes,10,opt,name=login_name,proto3" json:"login_name,omitempty"` // The password for this Account. - Password *wrappers.StringValue `protobuf:"bytes,20,opt,name=password,proto3" json:"password,omitempty"` + Password *wrapperspb.StringValue `protobuf:"bytes,20,opt,name=password,proto3" json:"password,omitempty"` } func (x *PasswordAccountAttributes) Reset() { @@ -216,7 +216,7 @@ func (x *PasswordAccountAttributes) GetLoginName() string { return "" } -func (x *PasswordAccountAttributes) GetPassword() *wrappers.StringValue { +func (x *PasswordAccountAttributes) GetPassword() *wrapperspb.StringValue { if x != nil { return x.Password } @@ -404,9 +404,9 @@ var file_controller_api_resources_accounts_v1_account_proto_goTypes = []interfac (*PasswordAccountAttributes)(nil), // 1: controller.api.resources.accounts.v1.PasswordAccountAttributes (*OidcAccountAttributes)(nil), // 2: controller.api.resources.accounts.v1.OidcAccountAttributes (*scopes.ScopeInfo)(nil), // 3: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 4: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 5: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 6: google.protobuf.Struct + (*wrapperspb.StringValue)(nil), // 4: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 5: google.protobuf.Timestamp + (*structpb.Struct)(nil), // 6: google.protobuf.Struct } var file_controller_api_resources_accounts_v1_account_proto_depIdxs = []int32{ 3, // 0: controller.api.resources.accounts.v1.Account.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/authmethods/auth_method.pb.go b/internal/gen/controller/api/resources/authmethods/auth_method.pb.go index d1f695d32..5bbd0d60f 100644 --- a/internal/gen/controller/api/resources/authmethods/auth_method.pb.go +++ b/internal/gen/controller/api/resources/authmethods/auth_method.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/authmethods/v1/auth_method.proto package authmethods import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -38,27 +38,27 @@ type AuthMethod struct { // Output only. Scope information for this Auth method. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` // The Auth Method type. Type string `protobuf:"bytes,90,opt,name=type,proto3" json:"type,omitempty"` // The attributes that are applicable for the specific Auth Method type. - Attributes *_struct.Struct `protobuf:"bytes,100,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,100,opt,name=attributes,proto3" json:"attributes,omitempty"` // Output only. Whether this auth method is the primary auth method for it's scope. // To change this value update the primary_auth_method_id field on the scope. IsPrimary bool `protobuf:"varint,110,opt,name=is_primary,proto3" json:"is_primary,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` // Output only. The authorized actions for the scope's collections. - AuthorizedCollectionActions map[string]*_struct.ListValue `protobuf:"bytes,310,rep,name=authorized_collection_actions,proto3" json:"authorized_collection_actions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AuthorizedCollectionActions map[string]*structpb.ListValue `protobuf:"bytes,310,rep,name=authorized_collection_actions,proto3" json:"authorized_collection_actions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *AuthMethod) Reset() { @@ -114,28 +114,28 @@ func (x *AuthMethod) GetScope() *scopes.ScopeInfo { return nil } -func (x *AuthMethod) GetName() *wrappers.StringValue { +func (x *AuthMethod) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *AuthMethod) GetDescription() *wrappers.StringValue { +func (x *AuthMethod) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *AuthMethod) GetCreatedTime() *timestamp.Timestamp { +func (x *AuthMethod) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *AuthMethod) GetUpdatedTime() *timestamp.Timestamp { +func (x *AuthMethod) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -156,7 +156,7 @@ func (x *AuthMethod) GetType() string { return "" } -func (x *AuthMethod) GetAttributes() *_struct.Struct { +func (x *AuthMethod) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -177,7 +177,7 @@ func (x *AuthMethod) GetAuthorizedActions() []string { return nil } -func (x *AuthMethod) GetAuthorizedCollectionActions() map[string]*_struct.ListValue { +func (x *AuthMethod) GetAuthorizedCollectionActions() map[string]*structpb.ListValue { if x != nil { return x.AuthorizedCollectionActions } @@ -255,11 +255,11 @@ type OidcAuthMethodAttributes struct { // strip off ".well-known/openid-configuration" if present. This will be // used for configuration discovery as well as for validation of the "iss" // claim. - Issuer *wrappers.StringValue `protobuf:"bytes,20,opt,name=issuer,proto3" json:"issuer,omitempty"` + Issuer *wrapperspb.StringValue `protobuf:"bytes,20,opt,name=issuer,proto3" json:"issuer,omitempty"` // An OAuth 2.0 Client Identifier valid at the Authorization Server. - ClientId *wrappers.StringValue `protobuf:"bytes,30,opt,name=client_id,proto3" json:"client_id,omitempty"` + ClientId *wrapperspb.StringValue `protobuf:"bytes,30,opt,name=client_id,proto3" json:"client_id,omitempty"` // Input only. The client's secret. - ClientSecret *wrappers.StringValue `protobuf:"bytes,40,opt,name=client_secret,proto3" json:"client_secret,omitempty"` + ClientSecret *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=client_secret,proto3" json:"client_secret,omitempty"` // Output only. The HMAC'd value of the clients secret to indicate whether // the client secret has changed. ClientSecretHmac string `protobuf:"bytes,50,opt,name=client_secret_hmac,proto3" json:"client_secret_hmac,omitempty"` @@ -267,13 +267,13 @@ type OidcAuthMethodAttributes struct { // a maximum acceptable time in seconds since the user's last authentication // before requiring the user to reauthenticate. 0 indicates an immediate // need to reauthenticate. - MaxAge *wrappers.UInt32Value `protobuf:"bytes,60,opt,name=max_age,proto3" json:"max_age,omitempty"` + MaxAge *wrapperspb.UInt32Value `protobuf:"bytes,60,opt,name=max_age,proto3" json:"max_age,omitempty"` // The signing algorithms allowed for the auth method. SigningAlgorithms []string `protobuf:"bytes,70,rep,name=signing_algorithms,proto3" json:"signing_algorithms,omitempty"` // The prefix that should be used for any URLs needed during the // authentication flow. This includes the callback URL, the token retrieval // URL, and the redirection URL used by the OIDC Authorization Server. - ApiUrlPrefix *wrappers.StringValue `protobuf:"bytes,80,opt,name=api_url_prefix,proto3" json:"api_url_prefix,omitempty"` + ApiUrlPrefix *wrapperspb.StringValue `protobuf:"bytes,80,opt,name=api_url_prefix,proto3" json:"api_url_prefix,omitempty"` // Output only. The callback URL that should be configured on the // Authorization Server to use during the authentication flow. CallbackUrl string `protobuf:"bytes,90,opt,name=callback_url,proto3" json:"callback_url,omitempty"` @@ -339,21 +339,21 @@ func (x *OidcAuthMethodAttributes) GetState() string { return "" } -func (x *OidcAuthMethodAttributes) GetIssuer() *wrappers.StringValue { +func (x *OidcAuthMethodAttributes) GetIssuer() *wrapperspb.StringValue { if x != nil { return x.Issuer } return nil } -func (x *OidcAuthMethodAttributes) GetClientId() *wrappers.StringValue { +func (x *OidcAuthMethodAttributes) GetClientId() *wrapperspb.StringValue { if x != nil { return x.ClientId } return nil } -func (x *OidcAuthMethodAttributes) GetClientSecret() *wrappers.StringValue { +func (x *OidcAuthMethodAttributes) GetClientSecret() *wrapperspb.StringValue { if x != nil { return x.ClientSecret } @@ -367,7 +367,7 @@ func (x *OidcAuthMethodAttributes) GetClientSecretHmac() string { return "" } -func (x *OidcAuthMethodAttributes) GetMaxAge() *wrappers.UInt32Value { +func (x *OidcAuthMethodAttributes) GetMaxAge() *wrapperspb.UInt32Value { if x != nil { return x.MaxAge } @@ -381,7 +381,7 @@ func (x *OidcAuthMethodAttributes) GetSigningAlgorithms() []string { return nil } -func (x *OidcAuthMethodAttributes) GetApiUrlPrefix() *wrappers.StringValue { +func (x *OidcAuthMethodAttributes) GetApiUrlPrefix() *wrapperspb.StringValue { if x != nil { return x.ApiUrlPrefix } @@ -935,13 +935,13 @@ var file_controller_api_resources_authmethods_v1_auth_method_proto_goTypes = []i (*OidcAuthMethodAuthenticateCallbackResponse)(nil), // 5: controller.api.resources.authmethods.v1.OidcAuthMethodAuthenticateCallbackResponse (*OidcAuthMethodAuthenticateTokenRequest)(nil), // 6: controller.api.resources.authmethods.v1.OidcAuthMethodAuthenticateTokenRequest (*OidcAuthMethodAuthenticateTokenResponse)(nil), // 7: controller.api.resources.authmethods.v1.OidcAuthMethodAuthenticateTokenResponse - nil, // 8: controller.api.resources.authmethods.v1.AuthMethod.AuthorizedCollectionActionsEntry - (*scopes.ScopeInfo)(nil), // 9: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 10: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 11: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 12: google.protobuf.Struct - (*wrappers.UInt32Value)(nil), // 13: google.protobuf.UInt32Value - (*_struct.ListValue)(nil), // 14: google.protobuf.ListValue + nil, // 8: controller.api.resources.authmethods.v1.AuthMethod.AuthorizedCollectionActionsEntry + (*scopes.ScopeInfo)(nil), // 9: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 10: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 11: google.protobuf.Timestamp + (*structpb.Struct)(nil), // 12: google.protobuf.Struct + (*wrapperspb.UInt32Value)(nil), // 13: google.protobuf.UInt32Value + (*structpb.ListValue)(nil), // 14: google.protobuf.ListValue } var file_controller_api_resources_authmethods_v1_auth_method_proto_depIdxs = []int32{ 9, // 0: controller.api.resources.authmethods.v1.AuthMethod.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/authtokens/authtoken.pb.go b/internal/gen/controller/api/resources/authtokens/authtoken.pb.go index 1c3de5445..8365cd829 100644 --- a/internal/gen/controller/api/resources/authtokens/authtoken.pb.go +++ b/internal/gen/controller/api/resources/authtokens/authtoken.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/authtokens/v1/authtoken.proto package authtokens import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" - _ "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -44,13 +44,13 @@ type AuthToken struct { // Output only. The ID of the Account associated with this Auth Token. AccountId string `protobuf:"bytes,70,opt,name=account_id,proto3" json:"account_id,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,80,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,80,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,90,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,90,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Output only. The approximate time this Auth Token was last used. - ApproximateLastUsedTime *timestamp.Timestamp `protobuf:"bytes,100,opt,name=approximate_last_used_time,proto3" json:"approximate_last_used_time,omitempty"` + ApproximateLastUsedTime *timestamppb.Timestamp `protobuf:"bytes,100,opt,name=approximate_last_used_time,proto3" json:"approximate_last_used_time,omitempty"` // Output only. The time this Auth Token expires. - ExpirationTime *timestamp.Timestamp `protobuf:"bytes,110,opt,name=expiration_time,proto3" json:"expiration_time,omitempty"` + ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,110,opt,name=expiration_time,proto3" json:"expiration_time,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` } @@ -136,28 +136,28 @@ func (x *AuthToken) GetAccountId() string { return "" } -func (x *AuthToken) GetCreatedTime() *timestamp.Timestamp { +func (x *AuthToken) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *AuthToken) GetUpdatedTime() *timestamp.Timestamp { +func (x *AuthToken) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } return nil } -func (x *AuthToken) GetApproximateLastUsedTime() *timestamp.Timestamp { +func (x *AuthToken) GetApproximateLastUsedTime() *timestamppb.Timestamp { if x != nil { return x.ApproximateLastUsedTime } return nil } -func (x *AuthToken) GetExpirationTime() *timestamp.Timestamp { +func (x *AuthToken) GetExpirationTime() *timestamppb.Timestamp { if x != nil { return x.ExpirationTime } @@ -246,9 +246,9 @@ func file_controller_api_resources_authtokens_v1_authtoken_proto_rawDescGZIP() [ var file_controller_api_resources_authtokens_v1_authtoken_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_controller_api_resources_authtokens_v1_authtoken_proto_goTypes = []interface{}{ - (*AuthToken)(nil), // 0: controller.api.resources.authtokens.v1.AuthToken - (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo - (*timestamp.Timestamp)(nil), // 2: google.protobuf.Timestamp + (*AuthToken)(nil), // 0: controller.api.resources.authtokens.v1.AuthToken + (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo + (*timestamppb.Timestamp)(nil), // 2: google.protobuf.Timestamp } var file_controller_api_resources_authtokens_v1_authtoken_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.authtokens.v1.AuthToken.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/groups/group.pb.go b/internal/gen/controller/api/resources/groups/group.pb.go index d36eace3d..05ff0df6c 100644 --- a/internal/gen/controller/api/resources/groups/group.pb.go +++ b/internal/gen/controller/api/resources/groups/group.pb.go @@ -1,18 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/groups/v1/group.proto package groups import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -94,13 +94,13 @@ type Group struct { // Output only. Scope information for this Group. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set descripton for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` @@ -165,28 +165,28 @@ func (x *Group) GetScope() *scopes.ScopeInfo { return nil } -func (x *Group) GetName() *wrappers.StringValue { +func (x *Group) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *Group) GetDescription() *wrappers.StringValue { +func (x *Group) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *Group) GetCreatedTime() *timestamp.Timestamp { +func (x *Group) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Group) GetUpdatedTime() *timestamp.Timestamp { +func (x *Group) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -302,11 +302,11 @@ func file_controller_api_resources_groups_v1_group_proto_rawDescGZIP() []byte { var file_controller_api_resources_groups_v1_group_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_controller_api_resources_groups_v1_group_proto_goTypes = []interface{}{ - (*Member)(nil), // 0: controller.api.resources.groups.v1.Member - (*Group)(nil), // 1: controller.api.resources.groups.v1.Group - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*Member)(nil), // 0: controller.api.resources.groups.v1.Member + (*Group)(nil), // 1: controller.api.resources.groups.v1.Group + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp } var file_controller_api_resources_groups_v1_group_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.groups.v1.Group.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go b/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go index f473211f4..3d43d6032 100644 --- a/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go +++ b/internal/gen/controller/api/resources/hostcatalogs/host_catalog.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/hostcatalogs/v1/host_catalog.proto package hostcatalogs import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -38,24 +38,24 @@ type HostCatalog struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` // The type of Host Catalog. Type string `protobuf:"bytes,90,opt,name=type,proto3" json:"type,omitempty"` // Attributes specific to the catalog type. - Attributes *_struct.Struct `protobuf:"bytes,100,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,100,opt,name=attributes,proto3" json:"attributes,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` // Output only. The authorized actions for the scope's collections. - AuthorizedCollectionActions map[string]*_struct.ListValue `protobuf:"bytes,310,rep,name=authorized_collection_actions,proto3" json:"authorized_collection_actions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AuthorizedCollectionActions map[string]*structpb.ListValue `protobuf:"bytes,310,rep,name=authorized_collection_actions,proto3" json:"authorized_collection_actions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *HostCatalog) Reset() { @@ -111,28 +111,28 @@ func (x *HostCatalog) GetScope() *scopes.ScopeInfo { return nil } -func (x *HostCatalog) GetName() *wrappers.StringValue { +func (x *HostCatalog) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *HostCatalog) GetDescription() *wrappers.StringValue { +func (x *HostCatalog) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *HostCatalog) GetCreatedTime() *timestamp.Timestamp { +func (x *HostCatalog) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *HostCatalog) GetUpdatedTime() *timestamp.Timestamp { +func (x *HostCatalog) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -153,7 +153,7 @@ func (x *HostCatalog) GetType() string { return "" } -func (x *HostCatalog) GetAttributes() *_struct.Struct { +func (x *HostCatalog) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -167,7 +167,7 @@ func (x *HostCatalog) GetAuthorizedActions() []string { return nil } -func (x *HostCatalog) GetAuthorizedCollectionActions() map[string]*_struct.ListValue { +func (x *HostCatalog) GetAuthorizedCollectionActions() map[string]*structpb.ListValue { if x != nil { return x.AuthorizedCollectionActions } @@ -272,13 +272,13 @@ func file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_rawDescGZI var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_goTypes = []interface{}{ - (*HostCatalog)(nil), // 0: controller.api.resources.hostcatalogs.v1.HostCatalog - nil, // 1: controller.api.resources.hostcatalogs.v1.HostCatalog.AuthorizedCollectionActionsEntry - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 5: google.protobuf.Struct - (*_struct.ListValue)(nil), // 6: google.protobuf.ListValue + (*HostCatalog)(nil), // 0: controller.api.resources.hostcatalogs.v1.HostCatalog + nil, // 1: controller.api.resources.hostcatalogs.v1.HostCatalog.AuthorizedCollectionActionsEntry + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*structpb.Struct)(nil), // 5: google.protobuf.Struct + (*structpb.ListValue)(nil), // 6: google.protobuf.ListValue } var file_controller_api_resources_hostcatalogs_v1_host_catalog_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.hostcatalogs.v1.HostCatalog.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/hosts/host.pb.go b/internal/gen/controller/api/resources/hosts/host.pb.go index 5ec3fdef0..44973c2c4 100644 --- a/internal/gen/controller/api/resources/hosts/host.pb.go +++ b/internal/gen/controller/api/resources/hosts/host.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/hosts/v1/host.proto package hosts import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -38,13 +38,13 @@ type Host struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` @@ -53,7 +53,7 @@ type Host struct { // Output only. A list of Host Sets containing this Host. HostSetIds []string `protobuf:"bytes,100,rep,name=host_set_ids,proto3" json:"host_set_ids,omitempty"` // The attributes that are applicable to the specific Host type. - Attributes *_struct.Struct `protobuf:"bytes,110,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,110,opt,name=attributes,proto3" json:"attributes,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` } @@ -111,28 +111,28 @@ func (x *Host) GetScope() *scopes.ScopeInfo { return nil } -func (x *Host) GetName() *wrappers.StringValue { +func (x *Host) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *Host) GetDescription() *wrappers.StringValue { +func (x *Host) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *Host) GetCreatedTime() *timestamp.Timestamp { +func (x *Host) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Host) GetUpdatedTime() *timestamp.Timestamp { +func (x *Host) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -160,7 +160,7 @@ func (x *Host) GetHostSetIds() []string { return nil } -func (x *Host) GetAttributes() *_struct.Struct { +func (x *Host) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -180,7 +180,7 @@ type StaticHostAttributes struct { unknownFields protoimpl.UnknownFields // The address (DNS or IP name) used to reach the Host. - Address *wrappers.StringValue `protobuf:"bytes,10,opt,name=address,proto3" json:"address,omitempty"` + Address *wrapperspb.StringValue `protobuf:"bytes,10,opt,name=address,proto3" json:"address,omitempty"` } func (x *StaticHostAttributes) Reset() { @@ -215,7 +215,7 @@ func (*StaticHostAttributes) Descriptor() ([]byte, []int) { return file_controller_api_resources_hosts_v1_host_proto_rawDescGZIP(), []int{1} } -func (x *StaticHostAttributes) GetAddress() *wrappers.StringValue { +func (x *StaticHostAttributes) GetAddress() *wrapperspb.StringValue { if x != nil { return x.Address } @@ -311,12 +311,12 @@ func file_controller_api_resources_hosts_v1_host_proto_rawDescGZIP() []byte { var file_controller_api_resources_hosts_v1_host_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_controller_api_resources_hosts_v1_host_proto_goTypes = []interface{}{ - (*Host)(nil), // 0: controller.api.resources.hosts.v1.Host - (*StaticHostAttributes)(nil), // 1: controller.api.resources.hosts.v1.StaticHostAttributes - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 5: google.protobuf.Struct + (*Host)(nil), // 0: controller.api.resources.hosts.v1.Host + (*StaticHostAttributes)(nil), // 1: controller.api.resources.hosts.v1.StaticHostAttributes + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*structpb.Struct)(nil), // 5: google.protobuf.Struct } var file_controller_api_resources_hosts_v1_host_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.hosts.v1.Host.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/hostsets/host_set.pb.go b/internal/gen/controller/api/resources/hostsets/host_set.pb.go index 7bac82bce..860cb4648 100644 --- a/internal/gen/controller/api/resources/hostsets/host_set.pb.go +++ b/internal/gen/controller/api/resources/hostsets/host_set.pb.go @@ -1,20 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/hostsets/v1/host_set.proto package hostsets import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -39,13 +39,13 @@ type HostSet struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` @@ -54,7 +54,7 @@ type HostSet struct { // Output only. A list of Hosts in this Host Set. HostIds []string `protobuf:"bytes,100,rep,name=host_ids,proto3" json:"host_ids,omitempty"` // The attributes that are applicable for the specific Host Set type. - Attributes *_struct.Struct `protobuf:"bytes,110,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,110,opt,name=attributes,proto3" json:"attributes,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` } @@ -112,28 +112,28 @@ func (x *HostSet) GetScope() *scopes.ScopeInfo { return nil } -func (x *HostSet) GetName() *wrappers.StringValue { +func (x *HostSet) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *HostSet) GetDescription() *wrappers.StringValue { +func (x *HostSet) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *HostSet) GetCreatedTime() *timestamp.Timestamp { +func (x *HostSet) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *HostSet) GetUpdatedTime() *timestamp.Timestamp { +func (x *HostSet) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -161,7 +161,7 @@ func (x *HostSet) GetHostIds() []string { return nil } -func (x *HostSet) GetAttributes() *_struct.Struct { +func (x *HostSet) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -259,11 +259,11 @@ func file_controller_api_resources_hostsets_v1_host_set_proto_rawDescGZIP() []by var file_controller_api_resources_hostsets_v1_host_set_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_controller_api_resources_hostsets_v1_host_set_proto_goTypes = []interface{}{ - (*HostSet)(nil), // 0: controller.api.resources.hostsets.v1.HostSet - (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 2: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp - (*_struct.Struct)(nil), // 4: google.protobuf.Struct + (*HostSet)(nil), // 0: controller.api.resources.hostsets.v1.HostSet + (*scopes.ScopeInfo)(nil), // 1: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 2: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp + (*structpb.Struct)(nil), // 4: google.protobuf.Struct } var file_controller_api_resources_hostsets_v1_host_set_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.hostsets.v1.HostSet.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/roles/role.pb.go b/internal/gen/controller/api/resources/roles/role.pb.go index aaa8e0c06..a0f8b5caa 100644 --- a/internal/gen/controller/api/resources/roles/role.pb.go +++ b/internal/gen/controller/api/resources/roles/role.pb.go @@ -1,18 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/roles/v1/role.proto package roles import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -235,18 +235,18 @@ type Role struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` // The Scope the grants will apply to. If the Role is at the global scope, this can be an org or project. If the Role is at an org scope, this can be a project within the org. It is invalid for this to be anything other than the Role's scope when the Role's scope is a project. - GrantScopeId *wrappers.StringValue `protobuf:"bytes,90,opt,name=grant_scope_id,proto3" json:"grant_scope_id,omitempty"` + GrantScopeId *wrapperspb.StringValue `protobuf:"bytes,90,opt,name=grant_scope_id,proto3" json:"grant_scope_id,omitempty"` // Output only. The IDs (only) of principals that are assigned to this role. PrincipalIds []string `protobuf:"bytes,100,rep,name=principal_ids,proto3" json:"principal_ids,omitempty"` // Output only. The principals that are assigned to this role. @@ -312,28 +312,28 @@ func (x *Role) GetScope() *scopes.ScopeInfo { return nil } -func (x *Role) GetName() *wrappers.StringValue { +func (x *Role) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *Role) GetDescription() *wrappers.StringValue { +func (x *Role) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *Role) GetCreatedTime() *timestamp.Timestamp { +func (x *Role) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Role) GetUpdatedTime() *timestamp.Timestamp { +func (x *Role) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -347,7 +347,7 @@ func (x *Role) GetVersion() uint32 { return 0 } -func (x *Role) GetGrantScopeId() *wrappers.StringValue { +func (x *Role) GetGrantScopeId() *wrapperspb.StringValue { if x != nil { return x.GrantScopeId } @@ -498,13 +498,13 @@ func file_controller_api_resources_roles_v1_role_proto_rawDescGZIP() []byte { var file_controller_api_resources_roles_v1_role_proto_msgTypes = make([]protoimpl.MessageInfo, 4) var file_controller_api_resources_roles_v1_role_proto_goTypes = []interface{}{ - (*Principal)(nil), // 0: controller.api.resources.roles.v1.Principal - (*GrantJson)(nil), // 1: controller.api.resources.roles.v1.GrantJson - (*Grant)(nil), // 2: controller.api.resources.roles.v1.Grant - (*Role)(nil), // 3: controller.api.resources.roles.v1.Role - (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 5: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 6: google.protobuf.Timestamp + (*Principal)(nil), // 0: controller.api.resources.roles.v1.Principal + (*GrantJson)(nil), // 1: controller.api.resources.roles.v1.GrantJson + (*Grant)(nil), // 2: controller.api.resources.roles.v1.Grant + (*Role)(nil), // 3: controller.api.resources.roles.v1.Role + (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 5: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 6: google.protobuf.Timestamp } var file_controller_api_resources_roles_v1_role_proto_depIdxs = []int32{ 1, // 0: controller.api.resources.roles.v1.Grant.json:type_name -> controller.api.resources.roles.v1.GrantJson diff --git a/internal/gen/controller/api/resources/scopes/scope.pb.go b/internal/gen/controller/api/resources/scopes/scope.pb.go index 2c8e8d569..c909636e5 100644 --- a/internal/gen/controller/api/resources/scopes/scope.pb.go +++ b/internal/gen/controller/api/resources/scopes/scope.pb.go @@ -1,18 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/scopes/v1/scope.proto package scopes import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -121,13 +121,13 @@ type Scope struct { // Output only. Scope information for this resource. Scope *ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set descripton for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` @@ -135,11 +135,11 @@ type Scope struct { Type string `protobuf:"bytes,90,opt,name=type,proto3" json:"type,omitempty"` // The ID of the primary auth method for this scope. A primary auth method // is allowed to vivify users when new accounts are created and is the source for the users account info - PrimaryAuthMethodId *wrappers.StringValue `protobuf:"bytes,100,opt,name=primary_auth_method_id,proto3" json:"primary_auth_method_id,omitempty"` + PrimaryAuthMethodId *wrapperspb.StringValue `protobuf:"bytes,100,opt,name=primary_auth_method_id,proto3" json:"primary_auth_method_id,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` // Output only. The authorized actions for the scope's collections. - AuthorizedCollectionActions map[string]*_struct.ListValue `protobuf:"bytes,310,rep,name=authorized_collection_actions,proto3" json:"authorized_collection_actions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` + AuthorizedCollectionActions map[string]*structpb.ListValue `protobuf:"bytes,310,rep,name=authorized_collection_actions,proto3" json:"authorized_collection_actions,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` } func (x *Scope) Reset() { @@ -195,28 +195,28 @@ func (x *Scope) GetScope() *ScopeInfo { return nil } -func (x *Scope) GetName() *wrappers.StringValue { +func (x *Scope) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *Scope) GetDescription() *wrappers.StringValue { +func (x *Scope) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *Scope) GetCreatedTime() *timestamp.Timestamp { +func (x *Scope) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Scope) GetUpdatedTime() *timestamp.Timestamp { +func (x *Scope) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -237,7 +237,7 @@ func (x *Scope) GetType() string { return "" } -func (x *Scope) GetPrimaryAuthMethodId() *wrappers.StringValue { +func (x *Scope) GetPrimaryAuthMethodId() *wrapperspb.StringValue { if x != nil { return x.PrimaryAuthMethodId } @@ -251,7 +251,7 @@ func (x *Scope) GetAuthorizedActions() []string { return nil } -func (x *Scope) GetAuthorizedCollectionActions() map[string]*_struct.ListValue { +func (x *Scope) GetAuthorizedCollectionActions() map[string]*structpb.ListValue { if x != nil { return x.AuthorizedCollectionActions } @@ -364,12 +364,12 @@ func file_controller_api_resources_scopes_v1_scope_proto_rawDescGZIP() []byte { var file_controller_api_resources_scopes_v1_scope_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_controller_api_resources_scopes_v1_scope_proto_goTypes = []interface{}{ - (*ScopeInfo)(nil), // 0: controller.api.resources.scopes.v1.ScopeInfo - (*Scope)(nil), // 1: controller.api.resources.scopes.v1.Scope - nil, // 2: controller.api.resources.scopes.v1.Scope.AuthorizedCollectionActionsEntry - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp - (*_struct.ListValue)(nil), // 5: google.protobuf.ListValue + (*ScopeInfo)(nil), // 0: controller.api.resources.scopes.v1.ScopeInfo + (*Scope)(nil), // 1: controller.api.resources.scopes.v1.Scope + nil, // 2: controller.api.resources.scopes.v1.Scope.AuthorizedCollectionActionsEntry + (*wrapperspb.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*structpb.ListValue)(nil), // 5: google.protobuf.ListValue } var file_controller_api_resources_scopes_v1_scope_proto_depIdxs = []int32{ 0, // 0: controller.api.resources.scopes.v1.Scope.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/sessions/session.pb.go b/internal/gen/controller/api/resources/sessions/session.pb.go index adcc40223..2cfa00dbe 100644 --- a/internal/gen/controller/api/resources/sessions/session.pb.go +++ b/internal/gen/controller/api/resources/sessions/session.pb.go @@ -1,20 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/sessions/v1/session.proto package sessions import ( - _ "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - _ "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/api/resources/targets" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -82,9 +82,9 @@ type SessionState struct { // The status of the Session, e.g. "pending", "active", "canceling", "terminated". Status string `protobuf:"bytes,10,opt,name=status,proto3" json:"status,omitempty"` // Output only. The time the Session entered this state. - StartTime *timestamp.Timestamp `protobuf:"bytes,20,opt,name=start_time,proto3" json:"start_time,omitempty"` + StartTime *timestamppb.Timestamp `protobuf:"bytes,20,opt,name=start_time,proto3" json:"start_time,omitempty"` // Output only. The time the Session stopped being in this state. - EndTime *timestamp.Timestamp `protobuf:"bytes,30,opt,name=end_time,proto3" json:"end_time,omitempty"` + EndTime *timestamppb.Timestamp `protobuf:"bytes,30,opt,name=end_time,proto3" json:"end_time,omitempty"` } func (x *SessionState) Reset() { @@ -126,14 +126,14 @@ func (x *SessionState) GetStatus() string { return "" } -func (x *SessionState) GetStartTime() *timestamp.Timestamp { +func (x *SessionState) GetStartTime() *timestamppb.Timestamp { if x != nil { return x.StartTime } return nil } -func (x *SessionState) GetEndTime() *timestamp.Timestamp { +func (x *SessionState) GetEndTime() *timestamppb.Timestamp { if x != nil { return x.EndTime } @@ -153,15 +153,15 @@ type Session struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used when canceling this Session to ensure that the operation is acting on a known session state. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` // Output only. Type of the Session (e.g. tcp). Type string `protobuf:"bytes,90,opt,name=type,proto3" json:"type,omitempty"` // Output only. After this time the connection will be expired, e.g. forcefully terminated. - ExpirationTime *timestamp.Timestamp `protobuf:"bytes,100,opt,name=expiration_time,proto3" json:"expiration_time,omitempty"` + ExpirationTime *timestamppb.Timestamp `protobuf:"bytes,100,opt,name=expiration_time,proto3" json:"expiration_time,omitempty"` // Output only. The ID of the Auth Token used to authenticate. AuthTokenId string `protobuf:"bytes,110,opt,name=auth_token_id,proto3" json:"auth_token_id,omitempty"` // Output only. The ID of the User that requested the Session. @@ -241,14 +241,14 @@ func (x *Session) GetScope() *scopes.ScopeInfo { return nil } -func (x *Session) GetCreatedTime() *timestamp.Timestamp { +func (x *Session) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Session) GetUpdatedTime() *timestamp.Timestamp { +func (x *Session) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -269,7 +269,7 @@ func (x *Session) GetType() string { return "" } -func (x *Session) GetExpirationTime() *timestamp.Timestamp { +func (x *Session) GetExpirationTime() *timestamppb.Timestamp { if x != nil { return x.ExpirationTime } @@ -473,11 +473,11 @@ func file_controller_api_resources_sessions_v1_session_proto_rawDescGZIP() []byt var file_controller_api_resources_sessions_v1_session_proto_msgTypes = make([]protoimpl.MessageInfo, 3) var file_controller_api_resources_sessions_v1_session_proto_goTypes = []interface{}{ - (*WorkerInfo)(nil), // 0: controller.api.resources.sessions.v1.WorkerInfo - (*SessionState)(nil), // 1: controller.api.resources.sessions.v1.SessionState - (*Session)(nil), // 2: controller.api.resources.sessions.v1.Session - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp - (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo + (*WorkerInfo)(nil), // 0: controller.api.resources.sessions.v1.WorkerInfo + (*SessionState)(nil), // 1: controller.api.resources.sessions.v1.SessionState + (*Session)(nil), // 2: controller.api.resources.sessions.v1.Session + (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp + (*scopes.ScopeInfo)(nil), // 4: controller.api.resources.scopes.v1.ScopeInfo } var file_controller_api_resources_sessions_v1_session_proto_depIdxs = []int32{ 3, // 0: controller.api.resources.sessions.v1.SessionState.start_time:type_name -> google.protobuf.Timestamp diff --git a/internal/gen/controller/api/resources/targets/target.pb.go b/internal/gen/controller/api/resources/targets/target.pb.go index 9496fd5a4..e6a5cfdde 100644 --- a/internal/gen/controller/api/resources/targets/target.pb.go +++ b/internal/gen/controller/api/resources/targets/target.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/targets/v1/target.proto package targets import ( - _struct "github.com/golang/protobuf/ptypes/struct" - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + structpb "google.golang.org/protobuf/types/known/structpb" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -95,13 +95,13 @@ type Target struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Required name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` @@ -112,13 +112,13 @@ type Target struct { // Output only. The Host Sets associated with this Target. HostSets []*HostSet `protobuf:"bytes,110,rep,name=host_sets,proto3" json:"host_sets,omitempty"` // Maximum total lifetime of a created Session, in seconds. - SessionMaxSeconds *wrappers.UInt32Value `protobuf:"bytes,120,opt,name=session_max_seconds,proto3" json:"session_max_seconds,omitempty"` + SessionMaxSeconds *wrapperspb.UInt32Value `protobuf:"bytes,120,opt,name=session_max_seconds,proto3" json:"session_max_seconds,omitempty"` // Maximum number of connections allowed in a Session. Unlimited is indicated by the value -1. - SessionConnectionLimit *wrappers.Int32Value `protobuf:"bytes,130,opt,name=session_connection_limit,proto3" json:"session_connection_limit,omitempty"` + SessionConnectionLimit *wrapperspb.Int32Value `protobuf:"bytes,130,opt,name=session_connection_limit,proto3" json:"session_connection_limit,omitempty"` // Optional boolean expression to filter the workers that are allowed to satisfy this request. - WorkerFilter *wrappers.StringValue `protobuf:"bytes,140,opt,name=worker_filter,proto3" json:"worker_filter,omitempty"` + WorkerFilter *wrapperspb.StringValue `protobuf:"bytes,140,opt,name=worker_filter,proto3" json:"worker_filter,omitempty"` // The attributes that are applicable for the specific Target. - Attributes *_struct.Struct `protobuf:"bytes,200,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,200,opt,name=attributes,proto3" json:"attributes,omitempty"` // Output only. The available actions on this resource for this user. AuthorizedActions []string `protobuf:"bytes,300,rep,name=authorized_actions,proto3" json:"authorized_actions,omitempty"` } @@ -176,28 +176,28 @@ func (x *Target) GetScope() *scopes.ScopeInfo { return nil } -func (x *Target) GetName() *wrappers.StringValue { +func (x *Target) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *Target) GetDescription() *wrappers.StringValue { +func (x *Target) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *Target) GetCreatedTime() *timestamp.Timestamp { +func (x *Target) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *Target) GetUpdatedTime() *timestamp.Timestamp { +func (x *Target) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -232,28 +232,28 @@ func (x *Target) GetHostSets() []*HostSet { return nil } -func (x *Target) GetSessionMaxSeconds() *wrappers.UInt32Value { +func (x *Target) GetSessionMaxSeconds() *wrapperspb.UInt32Value { if x != nil { return x.SessionMaxSeconds } return nil } -func (x *Target) GetSessionConnectionLimit() *wrappers.Int32Value { +func (x *Target) GetSessionConnectionLimit() *wrapperspb.Int32Value { if x != nil { return x.SessionConnectionLimit } return nil } -func (x *Target) GetWorkerFilter() *wrappers.StringValue { +func (x *Target) GetWorkerFilter() *wrapperspb.StringValue { if x != nil { return x.WorkerFilter } return nil } -func (x *Target) GetAttributes() *_struct.Struct { +func (x *Target) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -274,7 +274,7 @@ type TcpTargetAttributes struct { unknownFields protoimpl.UnknownFields // The default TCP port that will be used when connecting to the endpoint unless overridden by a Host Set or Host. - DefaultPort *wrappers.UInt32Value `protobuf:"bytes,10,opt,name=default_port,proto3" json:"default_port,omitempty"` + DefaultPort *wrapperspb.UInt32Value `protobuf:"bytes,10,opt,name=default_port,proto3" json:"default_port,omitempty"` } func (x *TcpTargetAttributes) Reset() { @@ -309,7 +309,7 @@ func (*TcpTargetAttributes) Descriptor() ([]byte, []int) { return file_controller_api_resources_targets_v1_target_proto_rawDescGZIP(), []int{2} } -func (x *TcpTargetAttributes) GetDefaultPort() *wrappers.UInt32Value { +func (x *TcpTargetAttributes) GetDefaultPort() *wrapperspb.UInt32Value { if x != nil { return x.DefaultPort } @@ -378,7 +378,7 @@ type SessionAuthorizationData struct { // Output only. Scope information for this the Target that authorized this session. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,40,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,40,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. Type of the session (e.g. tcp, ssh, etc.). Type string `protobuf:"bytes,80,opt,name=type,proto3" json:"type,omitempty"` // Output only. The connection limit being applied to this session. -1 means unlimited. This is not actually enforced on the client side but it provides for better listener handling by including it. @@ -448,7 +448,7 @@ func (x *SessionAuthorizationData) GetScope() *scopes.ScopeInfo { return nil } -func (x *SessionAuthorizationData) GetCreatedTime() *timestamp.Timestamp { +func (x *SessionAuthorizationData) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } @@ -517,7 +517,7 @@ type SessionAuthorization struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,40,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,40,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The User for which this Session was authorized. UserId string `protobuf:"bytes,50,opt,name=user_id,proto3" json:"user_id,omitempty"` // Output only. The Host Set containing the Host being used for this Session. @@ -585,7 +585,7 @@ func (x *SessionAuthorization) GetScope() *scopes.ScopeInfo { return nil } -func (x *SessionAuthorization) GetCreatedTime() *timestamp.Timestamp { +func (x *SessionAuthorization) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } @@ -823,11 +823,11 @@ var file_controller_api_resources_targets_v1_target_proto_goTypes = []interface{ (*SessionAuthorizationData)(nil), // 4: controller.api.resources.targets.v1.SessionAuthorizationData (*SessionAuthorization)(nil), // 5: controller.api.resources.targets.v1.SessionAuthorization (*scopes.ScopeInfo)(nil), // 6: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 7: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 8: google.protobuf.Timestamp - (*wrappers.UInt32Value)(nil), // 9: google.protobuf.UInt32Value - (*wrappers.Int32Value)(nil), // 10: google.protobuf.Int32Value - (*_struct.Struct)(nil), // 11: google.protobuf.Struct + (*wrapperspb.StringValue)(nil), // 7: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 8: google.protobuf.Timestamp + (*wrapperspb.UInt32Value)(nil), // 9: google.protobuf.UInt32Value + (*wrapperspb.Int32Value)(nil), // 10: google.protobuf.Int32Value + (*structpb.Struct)(nil), // 11: google.protobuf.Struct } var file_controller_api_resources_targets_v1_target_proto_depIdxs = []int32{ 6, // 0: controller.api.resources.targets.v1.Target.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/resources/users/user.pb.go b/internal/gen/controller/api/resources/users/user.pb.go index 179f86156..7123b8fe1 100644 --- a/internal/gen/controller/api/resources/users/user.pb.go +++ b/internal/gen/controller/api/resources/users/user.pb.go @@ -1,18 +1,18 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/resources/users/v1/user.proto package users import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" - wrappers "github.com/golang/protobuf/ptypes/wrappers" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "github.com/hashicorp/boundary/internal/gen/controller/protooptions" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" + wrapperspb "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -94,13 +94,13 @@ type User struct { // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // Optional name for identification purposes. - Name *wrappers.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` + Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty"` // Optional user-set description for identification purposes. - Description *wrappers.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` + Description *wrapperspb.StringValue `protobuf:"bytes,50,opt,name=description,proto3" json:"description,omitempty"` // Output only. The time this resource was created. - CreatedTime *timestamp.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,60,opt,name=created_time,proto3" json:"created_time,omitempty"` // Output only. The time this resource was last updated. - UpdatedTime *timestamp.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` + UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,70,opt,name=updated_time,proto3" json:"updated_time,omitempty"` // Version is used in mutation requests, after the initial creation, to ensure this resource has not changed. // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,80,opt,name=version,proto3" json:"version,omitempty"` @@ -165,28 +165,28 @@ func (x *User) GetScope() *scopes.ScopeInfo { return nil } -func (x *User) GetName() *wrappers.StringValue { +func (x *User) GetName() *wrapperspb.StringValue { if x != nil { return x.Name } return nil } -func (x *User) GetDescription() *wrappers.StringValue { +func (x *User) GetDescription() *wrapperspb.StringValue { if x != nil { return x.Description } return nil } -func (x *User) GetCreatedTime() *timestamp.Timestamp { +func (x *User) GetCreatedTime() *timestamppb.Timestamp { if x != nil { return x.CreatedTime } return nil } -func (x *User) GetUpdatedTime() *timestamp.Timestamp { +func (x *User) GetUpdatedTime() *timestamppb.Timestamp { if x != nil { return x.UpdatedTime } @@ -302,11 +302,11 @@ func file_controller_api_resources_users_v1_user_proto_rawDescGZIP() []byte { var file_controller_api_resources_users_v1_user_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_controller_api_resources_users_v1_user_proto_goTypes = []interface{}{ - (*Account)(nil), // 0: controller.api.resources.users.v1.Account - (*User)(nil), // 1: controller.api.resources.users.v1.User - (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo - (*wrappers.StringValue)(nil), // 3: google.protobuf.StringValue - (*timestamp.Timestamp)(nil), // 4: google.protobuf.Timestamp + (*Account)(nil), // 0: controller.api.resources.users.v1.Account + (*User)(nil), // 1: controller.api.resources.users.v1.User + (*scopes.ScopeInfo)(nil), // 2: controller.api.resources.scopes.v1.ScopeInfo + (*wrapperspb.StringValue)(nil), // 3: google.protobuf.StringValue + (*timestamppb.Timestamp)(nil), // 4: google.protobuf.Timestamp } var file_controller_api_resources_users_v1_user_proto_depIdxs = []int32{ 2, // 0: controller.api.resources.users.v1.User.scope:type_name -> controller.api.resources.scopes.v1.ScopeInfo diff --git a/internal/gen/controller/api/services/account_service.pb.go b/internal/gen/controller/api/services/account_service.pb.go index 259febbba..80231327a 100644 --- a/internal/gen/controller/api/services/account_service.pb.go +++ b/internal/gen/controller/api/services/account_service.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/account_service.proto package services import ( - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" accounts "github.com/hashicorp/boundary/internal/gen/controller/api/resources/accounts" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -328,9 +328,9 @@ type UpdateAccountRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *accounts.Account `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *accounts.Account `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateAccountRequest) Reset() { @@ -379,7 +379,7 @@ func (x *UpdateAccountRequest) GetItem() *accounts.Account { return nil } -func (x *UpdateAccountRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateAccountRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -971,7 +971,7 @@ var file_controller_api_services_v1_account_service_proto_goTypes = []interface{ (*ChangePasswordRequest)(nil), // 12: controller.api.services.v1.ChangePasswordRequest (*ChangePasswordResponse)(nil), // 13: controller.api.services.v1.ChangePasswordResponse (*accounts.Account)(nil), // 14: controller.api.resources.accounts.v1.Account - (*field_mask.FieldMask)(nil), // 15: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 15: google.protobuf.FieldMask } var file_controller_api_services_v1_account_service_proto_depIdxs = []int32{ 14, // 0: controller.api.services.v1.GetAccountResponse.item:type_name -> controller.api.resources.accounts.v1.Account diff --git a/internal/gen/controller/api/services/auth_method_service.pb.go b/internal/gen/controller/api/services/auth_method_service.pb.go index f73ad3865..2c64f0b02 100644 --- a/internal/gen/controller/api/services/auth_method_service.pb.go +++ b/internal/gen/controller/api/services/auth_method_service.pb.go @@ -1,20 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/auth_method_service.proto package services import ( - _struct "github.com/golang/protobuf/ptypes/struct" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" authmethods "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authmethods" authtokens "github.com/hashicorp/boundary/internal/gen/controller/api/resources/authtokens" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" + structpb "google.golang.org/protobuf/types/known/structpb" reflect "reflect" sync "sync" ) @@ -339,7 +339,7 @@ type UpdateAuthMethodRequest struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Item *authmethods.AuthMethod `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateAuthMethodRequest) Reset() { @@ -388,7 +388,7 @@ func (x *UpdateAuthMethodRequest) GetItem() *authmethods.AuthMethod { return nil } -func (x *UpdateAuthMethodRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateAuthMethodRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -597,7 +597,7 @@ type ChangeStateRequest struct { // The mutation will fail if the version does not match the latest known good version. Version uint32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` // The attributes specific to this auth method's state. - Attributes *_struct.Struct `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"` } func (x *ChangeStateRequest) Reset() { @@ -646,7 +646,7 @@ func (x *ChangeStateRequest) GetVersion() uint32 { return 0 } -func (x *ChangeStateRequest) GetAttributes() *_struct.Struct { +func (x *ChangeStateRequest) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -765,7 +765,7 @@ type OidcStartAttributes struct { unknownFields protoimpl.UnknownFields // An object which will be marshaled as JSON and roundtripped in the token command call. - RoundtripPayload *_struct.Struct `protobuf:"bytes,1,opt,name=roundtrip_payload,proto3" json:"roundtrip_payload,omitempty"` + RoundtripPayload *structpb.Struct `protobuf:"bytes,1,opt,name=roundtrip_payload,proto3" json:"roundtrip_payload,omitempty"` // Cached marshaled payload. This is not ingressed from the client; anything found will be thrown out. CachedRoundtripPayload string `protobuf:"bytes,2,opt,name=cached_roundtrip_payload,json=cachedRoundtripPayload,proto3" json:"cached_roundtrip_payload,omitempty"` } @@ -802,7 +802,7 @@ func (*OidcStartAttributes) Descriptor() ([]byte, []int) { return file_controller_api_services_v1_auth_method_service_proto_rawDescGZIP(), []int{14} } -func (x *OidcStartAttributes) GetRoundtripPayload() *_struct.Struct { +func (x *OidcStartAttributes) GetRoundtripPayload() *structpb.Struct { if x != nil { return x.RoundtripPayload } @@ -881,9 +881,9 @@ type AuthenticateRequest struct { // Deprecated; use "attributes" instead. // // Deprecated: Do not use. - Credentials *_struct.Struct `protobuf:"bytes,3,opt,name=credentials,proto3" json:"credentials,omitempty"` + Credentials *structpb.Struct `protobuf:"bytes,3,opt,name=credentials,proto3" json:"credentials,omitempty"` // Attributes are passed to the Auth Method; the valid keys and values depend on the type of Auth Method as well as the command. - Attributes *_struct.Struct `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"` // The command to perform. Command string `protobuf:"bytes,5,opt,name=command,proto3" json:"command,omitempty"` } @@ -935,14 +935,14 @@ func (x *AuthenticateRequest) GetTokenType() string { } // Deprecated: Do not use. -func (x *AuthenticateRequest) GetCredentials() *_struct.Struct { +func (x *AuthenticateRequest) GetCredentials() *structpb.Struct { if x != nil { return x.Credentials } return nil } -func (x *AuthenticateRequest) GetAttributes() *_struct.Struct { +func (x *AuthenticateRequest) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -962,7 +962,7 @@ type AuthenticateResponse struct { unknownFields protoimpl.UnknownFields // Valid keys and values depend on the type of Auth Method as well as the command. - Attributes *_struct.Struct `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"` + Attributes *structpb.Struct `protobuf:"bytes,4,opt,name=attributes,proto3" json:"attributes,omitempty"` // The command that was performed. Command string `protobuf:"bytes,5,opt,name=command,proto3" json:"command,omitempty"` } @@ -999,7 +999,7 @@ func (*AuthenticateResponse) Descriptor() ([]byte, []int) { return file_controller_api_services_v1_auth_method_service_proto_rawDescGZIP(), []int{17} } -func (x *AuthenticateResponse) GetAttributes() *_struct.Struct { +func (x *AuthenticateResponse) GetAttributes() *structpb.Struct { if x != nil { return x.Attributes } @@ -1024,7 +1024,7 @@ type AuthenticateLoginRequest struct { // to keep it safe from rogue JS in the browser. TokenType string `protobuf:"bytes,2,opt,name=token_type,proto3" json:"token_type,omitempty"` // Credentials are passed to the Auth Method; the valid keys and values depend on the type of Auth Method. - Credentials *_struct.Struct `protobuf:"bytes,3,opt,name=credentials,proto3" json:"credentials,omitempty"` + Credentials *structpb.Struct `protobuf:"bytes,3,opt,name=credentials,proto3" json:"credentials,omitempty"` } func (x *AuthenticateLoginRequest) Reset() { @@ -1073,7 +1073,7 @@ func (x *AuthenticateLoginRequest) GetTokenType() string { return "" } -func (x *AuthenticateLoginRequest) GetCredentials() *_struct.Struct { +func (x *AuthenticateLoginRequest) GetCredentials() *structpb.Struct { if x != nil { return x.Credentials } @@ -1447,8 +1447,8 @@ var file_controller_api_services_v1_auth_method_service_proto_goTypes = []interf (*AuthenticateLoginRequest)(nil), // 18: controller.api.services.v1.AuthenticateLoginRequest (*AuthenticateLoginResponse)(nil), // 19: controller.api.services.v1.AuthenticateLoginResponse (*authmethods.AuthMethod)(nil), // 20: controller.api.resources.authmethods.v1.AuthMethod - (*field_mask.FieldMask)(nil), // 21: google.protobuf.FieldMask - (*_struct.Struct)(nil), // 22: google.protobuf.Struct + (*fieldmaskpb.FieldMask)(nil), // 21: google.protobuf.FieldMask + (*structpb.Struct)(nil), // 22: google.protobuf.Struct (*authtokens.AuthToken)(nil), // 23: controller.api.resources.authtokens.v1.AuthToken } var file_controller_api_services_v1_auth_method_service_proto_depIdxs = []int32{ diff --git a/internal/gen/controller/api/services/authtokens_service.pb.go b/internal/gen/controller/api/services/authtokens_service.pb.go index fb2712629..1612d0088 100644 --- a/internal/gen/controller/api/services/authtokens_service.pb.go +++ b/internal/gen/controller/api/services/authtokens_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/authtokens_service.proto package services diff --git a/internal/gen/controller/api/services/group_service.pb.go b/internal/gen/controller/api/services/group_service.pb.go index 184fd6cf0..2b51bce25 100644 --- a/internal/gen/controller/api/services/group_service.pb.go +++ b/internal/gen/controller/api/services/group_service.pb.go @@ -1,20 +1,20 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/group_service.proto package services import ( - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" groups "github.com/hashicorp/boundary/internal/gen/controller/api/resources/groups" _ "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -337,9 +337,9 @@ type UpdateGroupRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *groups.Group `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *groups.Group `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateGroupRequest) Reset() { @@ -388,7 +388,7 @@ func (x *UpdateGroupRequest) GetItem() *groups.Group { return nil } -func (x *UpdateGroupRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateGroupRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -1108,7 +1108,7 @@ var file_controller_api_services_v1_group_service_proto_goTypes = []interface{}{ (*RemoveGroupMembersRequest)(nil), // 14: controller.api.services.v1.RemoveGroupMembersRequest (*RemoveGroupMembersResponse)(nil), // 15: controller.api.services.v1.RemoveGroupMembersResponse (*groups.Group)(nil), // 16: controller.api.resources.groups.v1.Group - (*field_mask.FieldMask)(nil), // 17: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 17: google.protobuf.FieldMask } var file_controller_api_services_v1_group_service_proto_depIdxs = []int32{ 16, // 0: controller.api.services.v1.GetGroupResponse.item:type_name -> controller.api.resources.groups.v1.Group diff --git a/internal/gen/controller/api/services/host_catalog_service.pb.go b/internal/gen/controller/api/services/host_catalog_service.pb.go index 07d4129b3..db645b8fa 100644 --- a/internal/gen/controller/api/services/host_catalog_service.pb.go +++ b/internal/gen/controller/api/services/host_catalog_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/host_catalog_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" hostcatalogs "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hostcatalogs" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -337,7 +337,7 @@ type UpdateHostCatalogRequest struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` Item *hostcatalogs.HostCatalog `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` } func (x *UpdateHostCatalogRequest) Reset() { @@ -386,7 +386,7 @@ func (x *UpdateHostCatalogRequest) GetItem() *hostcatalogs.HostCatalog { return nil } -func (x *UpdateHostCatalogRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateHostCatalogRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -698,7 +698,7 @@ var file_controller_api_services_v1_host_catalog_service_proto_goTypes = []inter (*DeleteHostCatalogRequest)(nil), // 8: controller.api.services.v1.DeleteHostCatalogRequest (*DeleteHostCatalogResponse)(nil), // 9: controller.api.services.v1.DeleteHostCatalogResponse (*hostcatalogs.HostCatalog)(nil), // 10: controller.api.resources.hostcatalogs.v1.HostCatalog - (*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 11: google.protobuf.FieldMask } var file_controller_api_services_v1_host_catalog_service_proto_depIdxs = []int32{ 10, // 0: controller.api.services.v1.GetHostCatalogResponse.item:type_name -> controller.api.resources.hostcatalogs.v1.HostCatalog diff --git a/internal/gen/controller/api/services/host_service.pb.go b/internal/gen/controller/api/services/host_service.pb.go index 7b976c1de..ff0b69861 100644 --- a/internal/gen/controller/api/services/host_service.pb.go +++ b/internal/gen/controller/api/services/host_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/host_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" hosts "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hosts" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -327,9 +327,9 @@ type UpdateHostRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *hosts.Host `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *hosts.Host `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateHostRequest) Reset() { @@ -378,7 +378,7 @@ func (x *UpdateHostRequest) GetItem() *hosts.Host { return nil } -func (x *UpdateHostRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateHostRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -656,18 +656,18 @@ func file_controller_api_services_v1_host_service_proto_rawDescGZIP() []byte { var file_controller_api_services_v1_host_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_controller_api_services_v1_host_service_proto_goTypes = []interface{}{ - (*GetHostRequest)(nil), // 0: controller.api.services.v1.GetHostRequest - (*GetHostResponse)(nil), // 1: controller.api.services.v1.GetHostResponse - (*ListHostsRequest)(nil), // 2: controller.api.services.v1.ListHostsRequest - (*ListHostsResponse)(nil), // 3: controller.api.services.v1.ListHostsResponse - (*CreateHostRequest)(nil), // 4: controller.api.services.v1.CreateHostRequest - (*CreateHostResponse)(nil), // 5: controller.api.services.v1.CreateHostResponse - (*UpdateHostRequest)(nil), // 6: controller.api.services.v1.UpdateHostRequest - (*UpdateHostResponse)(nil), // 7: controller.api.services.v1.UpdateHostResponse - (*DeleteHostRequest)(nil), // 8: controller.api.services.v1.DeleteHostRequest - (*DeleteHostResponse)(nil), // 9: controller.api.services.v1.DeleteHostResponse - (*hosts.Host)(nil), // 10: controller.api.resources.hosts.v1.Host - (*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask + (*GetHostRequest)(nil), // 0: controller.api.services.v1.GetHostRequest + (*GetHostResponse)(nil), // 1: controller.api.services.v1.GetHostResponse + (*ListHostsRequest)(nil), // 2: controller.api.services.v1.ListHostsRequest + (*ListHostsResponse)(nil), // 3: controller.api.services.v1.ListHostsResponse + (*CreateHostRequest)(nil), // 4: controller.api.services.v1.CreateHostRequest + (*CreateHostResponse)(nil), // 5: controller.api.services.v1.CreateHostResponse + (*UpdateHostRequest)(nil), // 6: controller.api.services.v1.UpdateHostRequest + (*UpdateHostResponse)(nil), // 7: controller.api.services.v1.UpdateHostResponse + (*DeleteHostRequest)(nil), // 8: controller.api.services.v1.DeleteHostRequest + (*DeleteHostResponse)(nil), // 9: controller.api.services.v1.DeleteHostResponse + (*hosts.Host)(nil), // 10: controller.api.resources.hosts.v1.Host + (*fieldmaskpb.FieldMask)(nil), // 11: google.protobuf.FieldMask } var file_controller_api_services_v1_host_service_proto_depIdxs = []int32{ 10, // 0: controller.api.services.v1.GetHostResponse.item:type_name -> controller.api.resources.hosts.v1.Host diff --git a/internal/gen/controller/api/services/host_set_service.pb.go b/internal/gen/controller/api/services/host_set_service.pb.go index 658a9b7de..a0a13d258 100644 --- a/internal/gen/controller/api/services/host_set_service.pb.go +++ b/internal/gen/controller/api/services/host_set_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/host_set_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" hostsets "github.com/hashicorp/boundary/internal/gen/controller/api/resources/hostsets" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -327,9 +327,9 @@ type UpdateHostSetRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *hostsets.HostSet `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *hostsets.HostSet `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateHostSetRequest) Reset() { @@ -378,7 +378,7 @@ func (x *UpdateHostSetRequest) GetItem() *hostsets.HostSet { return nil } -func (x *UpdateHostSetRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateHostSetRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -1098,7 +1098,7 @@ var file_controller_api_services_v1_host_set_service_proto_goTypes = []interface (*RemoveHostSetHostsRequest)(nil), // 14: controller.api.services.v1.RemoveHostSetHostsRequest (*RemoveHostSetHostsResponse)(nil), // 15: controller.api.services.v1.RemoveHostSetHostsResponse (*hostsets.HostSet)(nil), // 16: controller.api.resources.hostsets.v1.HostSet - (*field_mask.FieldMask)(nil), // 17: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 17: google.protobuf.FieldMask } var file_controller_api_services_v1_host_set_service_proto_depIdxs = []int32{ 16, // 0: controller.api.services.v1.GetHostSetResponse.item:type_name -> controller.api.resources.hostsets.v1.HostSet diff --git a/internal/gen/controller/api/services/role_service.pb.go b/internal/gen/controller/api/services/role_service.pb.go index 8e07b1024..a2ccf3acf 100644 --- a/internal/gen/controller/api/services/role_service.pb.go +++ b/internal/gen/controller/api/services/role_service.pb.go @@ -1,19 +1,19 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/role_service.proto package services import ( - _ "github.com/golang/protobuf/ptypes/wrappers" _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" roles "github.com/hashicorp/boundary/internal/gen/controller/api/resources/roles" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" + _ "google.golang.org/protobuf/types/known/wrapperspb" reflect "reflect" sync "sync" ) @@ -336,9 +336,9 @@ type UpdateRoleRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *roles.Role `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *roles.Role `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateRoleRequest) Reset() { @@ -387,7 +387,7 @@ func (x *UpdateRoleRequest) GetItem() *roles.Role { return nil } -func (x *UpdateRoleRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateRoleRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -1523,7 +1523,7 @@ var file_controller_api_services_v1_role_service_proto_goTypes = []interface{}{ (*RemoveRoleGrantsRequest)(nil), // 20: controller.api.services.v1.RemoveRoleGrantsRequest (*RemoveRoleGrantsResponse)(nil), // 21: controller.api.services.v1.RemoveRoleGrantsResponse (*roles.Role)(nil), // 22: controller.api.resources.roles.v1.Role - (*field_mask.FieldMask)(nil), // 23: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 23: google.protobuf.FieldMask } var file_controller_api_services_v1_role_service_proto_depIdxs = []int32{ 22, // 0: controller.api.services.v1.GetRoleResponse.item:type_name -> controller.api.resources.roles.v1.Role diff --git a/internal/gen/controller/api/services/scope_service.pb.go b/internal/gen/controller/api/services/scope_service.pb.go index 482150a7d..042aaee09 100644 --- a/internal/gen/controller/api/services/scope_service.pb.go +++ b/internal/gen/controller/api/services/scope_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/scope_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" scopes "github.com/hashicorp/boundary/internal/gen/controller/api/resources/scopes" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -351,9 +351,9 @@ type UpdateScopeRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *scopes.Scope `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *scopes.Scope `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateScopeRequest) Reset() { @@ -402,7 +402,7 @@ func (x *UpdateScopeRequest) GetItem() *scopes.Scope { return nil } -func (x *UpdateScopeRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateScopeRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -696,18 +696,18 @@ func file_controller_api_services_v1_scope_service_proto_rawDescGZIP() []byte { var file_controller_api_services_v1_scope_service_proto_msgTypes = make([]protoimpl.MessageInfo, 10) var file_controller_api_services_v1_scope_service_proto_goTypes = []interface{}{ - (*GetScopeRequest)(nil), // 0: controller.api.services.v1.GetScopeRequest - (*GetScopeResponse)(nil), // 1: controller.api.services.v1.GetScopeResponse - (*ListScopesRequest)(nil), // 2: controller.api.services.v1.ListScopesRequest - (*ListScopesResponse)(nil), // 3: controller.api.services.v1.ListScopesResponse - (*CreateScopeRequest)(nil), // 4: controller.api.services.v1.CreateScopeRequest - (*CreateScopeResponse)(nil), // 5: controller.api.services.v1.CreateScopeResponse - (*UpdateScopeRequest)(nil), // 6: controller.api.services.v1.UpdateScopeRequest - (*UpdateScopeResponse)(nil), // 7: controller.api.services.v1.UpdateScopeResponse - (*DeleteScopeRequest)(nil), // 8: controller.api.services.v1.DeleteScopeRequest - (*DeleteScopeResponse)(nil), // 9: controller.api.services.v1.DeleteScopeResponse - (*scopes.Scope)(nil), // 10: controller.api.resources.scopes.v1.Scope - (*field_mask.FieldMask)(nil), // 11: google.protobuf.FieldMask + (*GetScopeRequest)(nil), // 0: controller.api.services.v1.GetScopeRequest + (*GetScopeResponse)(nil), // 1: controller.api.services.v1.GetScopeResponse + (*ListScopesRequest)(nil), // 2: controller.api.services.v1.ListScopesRequest + (*ListScopesResponse)(nil), // 3: controller.api.services.v1.ListScopesResponse + (*CreateScopeRequest)(nil), // 4: controller.api.services.v1.CreateScopeRequest + (*CreateScopeResponse)(nil), // 5: controller.api.services.v1.CreateScopeResponse + (*UpdateScopeRequest)(nil), // 6: controller.api.services.v1.UpdateScopeRequest + (*UpdateScopeResponse)(nil), // 7: controller.api.services.v1.UpdateScopeResponse + (*DeleteScopeRequest)(nil), // 8: controller.api.services.v1.DeleteScopeRequest + (*DeleteScopeResponse)(nil), // 9: controller.api.services.v1.DeleteScopeResponse + (*scopes.Scope)(nil), // 10: controller.api.resources.scopes.v1.Scope + (*fieldmaskpb.FieldMask)(nil), // 11: google.protobuf.FieldMask } var file_controller_api_services_v1_scope_service_proto_depIdxs = []int32{ 10, // 0: controller.api.services.v1.GetScopeResponse.item:type_name -> controller.api.resources.scopes.v1.Scope diff --git a/internal/gen/controller/api/services/session_service.pb.go b/internal/gen/controller/api/services/session_service.pb.go index 99c8e0d56..47812e362 100644 --- a/internal/gen/controller/api/services/session_service.pb.go +++ b/internal/gen/controller/api/services/session_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/session_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" sessions "github.com/hashicorp/boundary/internal/gen/controller/api/resources/sessions" _ "google.golang.org/genproto/googleapis/api/annotations" - _ "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) diff --git a/internal/gen/controller/api/services/target_service.pb.go b/internal/gen/controller/api/services/target_service.pb.go index 17cef24f4..8a3f1add9 100644 --- a/internal/gen/controller/api/services/target_service.pb.go +++ b/internal/gen/controller/api/services/target_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/target_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" targets "github.com/hashicorp/boundary/internal/gen/controller/api/resources/targets" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -335,9 +335,9 @@ type UpdateTargetRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *targets.Target `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *targets.Target `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateTargetRequest) Reset() { @@ -386,7 +386,7 @@ func (x *UpdateTargetRequest) GetItem() *targets.Target { return nil } -func (x *UpdateTargetRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateTargetRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -1265,7 +1265,7 @@ var file_controller_api_services_v1_target_service_proto_goTypes = []interface{} (*AuthorizeSessionRequest)(nil), // 16: controller.api.services.v1.AuthorizeSessionRequest (*AuthorizeSessionResponse)(nil), // 17: controller.api.services.v1.AuthorizeSessionResponse (*targets.Target)(nil), // 18: controller.api.resources.targets.v1.Target - (*field_mask.FieldMask)(nil), // 19: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 19: google.protobuf.FieldMask (*targets.SessionAuthorization)(nil), // 20: controller.api.resources.targets.v1.SessionAuthorization } var file_controller_api_services_v1_target_service_proto_depIdxs = []int32{ diff --git a/internal/gen/controller/api/services/user_service.pb.go b/internal/gen/controller/api/services/user_service.pb.go index dc8cb5eb9..6865e4db0 100644 --- a/internal/gen/controller/api/services/user_service.pb.go +++ b/internal/gen/controller/api/services/user_service.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/api/services/v1/user_service.proto package services @@ -10,9 +10,9 @@ import ( _ "github.com/grpc-ecosystem/grpc-gateway/v2/protoc-gen-openapiv2/options" users "github.com/hashicorp/boundary/internal/gen/controller/api/resources/users" _ "google.golang.org/genproto/googleapis/api/annotations" - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -335,9 +335,9 @@ type UpdateUserRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - Item *users.User `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` - UpdateMask *field_mask.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` + Item *users.User `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` + UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,proto3" json:"update_mask,omitempty"` } func (x *UpdateUserRequest) Reset() { @@ -386,7 +386,7 @@ func (x *UpdateUserRequest) GetItem() *users.User { return nil } -func (x *UpdateUserRequest) GetUpdateMask() *field_mask.FieldMask { +func (x *UpdateUserRequest) GetUpdateMask() *fieldmaskpb.FieldMask { if x != nil { return x.UpdateMask } @@ -1099,7 +1099,7 @@ var file_controller_api_services_v1_user_service_proto_goTypes = []interface{}{ (*RemoveUserAccountsRequest)(nil), // 14: controller.api.services.v1.RemoveUserAccountsRequest (*RemoveUserAccountsResponse)(nil), // 15: controller.api.services.v1.RemoveUserAccountsResponse (*users.User)(nil), // 16: controller.api.resources.users.v1.User - (*field_mask.FieldMask)(nil), // 17: google.protobuf.FieldMask + (*fieldmaskpb.FieldMask)(nil), // 17: google.protobuf.FieldMask } var file_controller_api_services_v1_user_service_proto_depIdxs = []int32{ 16, // 0: controller.api.services.v1.GetUserResponse.item:type_name -> controller.api.resources.users.v1.User diff --git a/internal/gen/controller/protooptions/options.pb.go b/internal/gen/controller/protooptions/options.pb.go index 322673570..484f7c3d5 100644 --- a/internal/gen/controller/protooptions/options.pb.go +++ b/internal/gen/controller/protooptions/options.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/custom_options/v1/options.proto package protooptions import ( - descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + descriptorpb "google.golang.org/protobuf/types/descriptorpb" reflect "reflect" sync "sync" ) @@ -78,7 +78,7 @@ func (x *MaskMapping) GetThat() string { var file_controller_custom_options_v1_options_proto_extTypes = []protoimpl.ExtensionInfo{ { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*MaskMapping)(nil), Field: 85464, Name: "controller.custom_options.v1.mask_mapping", @@ -86,7 +86,7 @@ var file_controller_custom_options_v1_options_proto_extTypes = []protoimpl.Exten Filename: "controller/custom_options/v1/options.proto", }, { - ExtendedType: (*descriptor.FieldOptions)(nil), + ExtendedType: (*descriptorpb.FieldOptions)(nil), ExtensionType: (*bool)(nil), Field: 85412, Name: "controller.custom_options.v1.generate_sdk_option", @@ -95,7 +95,7 @@ var file_controller_custom_options_v1_options_proto_extTypes = []protoimpl.Exten }, } -// Extension fields to descriptor.FieldOptions. +// Extension fields to descriptorpb.FieldOptions. var ( // mask_mapping is an option which tags a field with the expected field mask // used by a companion proto if applied on the field this option is for. @@ -158,8 +158,8 @@ func file_controller_custom_options_v1_options_proto_rawDescGZIP() []byte { var file_controller_custom_options_v1_options_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_controller_custom_options_v1_options_proto_goTypes = []interface{}{ - (*MaskMapping)(nil), // 0: controller.custom_options.v1.MaskMapping - (*descriptor.FieldOptions)(nil), // 1: google.protobuf.FieldOptions + (*MaskMapping)(nil), // 0: controller.custom_options.v1.MaskMapping + (*descriptorpb.FieldOptions)(nil), // 1: google.protobuf.FieldOptions } var file_controller_custom_options_v1_options_proto_depIdxs = []int32{ 1, // 0: controller.custom_options.v1.mask_mapping:extendee -> google.protobuf.FieldOptions diff --git a/internal/gen/controller/protooptions/testing.pb.go b/internal/gen/controller/protooptions/testing.pb.go index af6f951d4..1e96227b3 100644 --- a/internal/gen/controller/protooptions/testing.pb.go +++ b/internal/gen/controller/protooptions/testing.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/custom_options/v1/testing.proto package protooptions diff --git a/internal/gen/controller/servers/services/server_coordination_service.pb.go b/internal/gen/controller/servers/services/server_coordination_service.pb.go index 1cbdd8df1..f5851284f 100644 --- a/internal/gen/controller/servers/services/server_coordination_service.pb.go +++ b/internal/gen/controller/servers/services/server_coordination_service.pb.go @@ -1,16 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/servers/services/v1/server_coordination_service.proto package services import ( - _ "github.com/golang/protobuf/ptypes/timestamp" servers "github.com/hashicorp/boundary/internal/servers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + _ "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) diff --git a/internal/gen/controller/servers/services/session_service.pb.go b/internal/gen/controller/servers/services/session_service.pb.go index 79c54a7bb..b52b5e128 100644 --- a/internal/gen/controller/servers/services/session_service.pb.go +++ b/internal/gen/controller/servers/services/session_service.pb.go @@ -1,17 +1,17 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/servers/services/v1/session_service.proto package services import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" targets "github.com/hashicorp/boundary/internal/gen/controller/api/resources/targets" _ "github.com/hashicorp/boundary/internal/servers" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -92,7 +92,7 @@ type LookupSessionResponse struct { TofuToken string `protobuf:"bytes,20,opt,name=tofu_token,json=tofuToken,proto3" json:"tofu_token,omitempty"` Version uint32 `protobuf:"varint,30,opt,name=version,proto3" json:"version,omitempty"` Endpoint string `protobuf:"bytes,40,opt,name=endpoint,proto3" json:"endpoint,omitempty"` - Expiration *timestamp.Timestamp `protobuf:"bytes,50,opt,name=expiration,proto3" json:"expiration,omitempty"` + Expiration *timestamppb.Timestamp `protobuf:"bytes,50,opt,name=expiration,proto3" json:"expiration,omitempty"` Status SESSIONSTATUS `protobuf:"varint,60,opt,name=status,proto3,enum=controller.servers.services.v1.SESSIONSTATUS" json:"status,omitempty"` ConnectionLimit int32 `protobuf:"varint,70,opt,name=connection_limit,json=connectionLimit,proto3" json:"connection_limit,omitempty"` ConnectionsLeft int32 `protobuf:"varint,80,opt,name=connections_left,json=connectionsLeft,proto3" json:"connections_left,omitempty"` @@ -162,7 +162,7 @@ func (x *LookupSessionResponse) GetEndpoint() string { return "" } -func (x *LookupSessionResponse) GetExpiration() *timestamp.Timestamp { +func (x *LookupSessionResponse) GetExpiration() *timestamppb.Timestamp { if x != nil { return x.Expiration } @@ -1153,7 +1153,7 @@ var file_controller_servers_services_v1_session_service_proto_goTypes = []interf (*CloseConnectionResponseData)(nil), // 12: controller.servers.services.v1.CloseConnectionResponseData (*CloseConnectionResponse)(nil), // 13: controller.servers.services.v1.CloseConnectionResponse (*targets.SessionAuthorizationData)(nil), // 14: controller.api.resources.targets.v1.SessionAuthorizationData - (*timestamp.Timestamp)(nil), // 15: google.protobuf.Timestamp + (*timestamppb.Timestamp)(nil), // 15: google.protobuf.Timestamp (SESSIONSTATUS)(0), // 16: controller.servers.services.v1.SESSIONSTATUS (CONNECTIONSTATUS)(0), // 17: controller.servers.services.v1.CONNECTIONSTATUS } diff --git a/internal/gen/controller/tokens/tokens.pb.go b/internal/gen/controller/tokens/tokens.pb.go index 4a06b9a59..d02e03e27 100644 --- a/internal/gen/controller/tokens/tokens.pb.go +++ b/internal/gen/controller/tokens/tokens.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/tokens/v1/tokens.proto package tokens diff --git a/internal/host/static/store/static.pb.go b/internal/host/static/store/static.pb.go index 637e07359..9490278da 100644 --- a/internal/host/static/store/static.pb.go +++ b/internal/host/static/store/static.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/host/static/store/v1/static.proto // Package store provides protobufs for storing types in the static host diff --git a/internal/host/store/host.pb.go b/internal/host/store/host.pb.go index 834173c72..7de73e08d 100644 --- a/internal/host/store/host.pb.go +++ b/internal/host/store/host.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/host/store/v1/host.proto // Package store provides protobufs for storing types in the host package. diff --git a/internal/iam/store/group.pb.go b/internal/iam/store/group.pb.go index f45b3df0f..633c13cd0 100644 --- a/internal/iam/store/group.pb.go +++ b/internal/iam/store/group.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/group.proto package store diff --git a/internal/iam/store/group_member.pb.go b/internal/iam/store/group_member.pb.go index c6c0c4585..55cb78fde 100644 --- a/internal/iam/store/group_member.pb.go +++ b/internal/iam/store/group_member.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/group_member.proto package store diff --git a/internal/iam/store/principal_role.pb.go b/internal/iam/store/principal_role.pb.go index c2be3b2e9..b3680c6be 100644 --- a/internal/iam/store/principal_role.pb.go +++ b/internal/iam/store/principal_role.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/principal_role.proto package store diff --git a/internal/iam/store/role.pb.go b/internal/iam/store/role.pb.go index 6e299b515..42511fe49 100644 --- a/internal/iam/store/role.pb.go +++ b/internal/iam/store/role.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/role.proto package store diff --git a/internal/iam/store/role_grant.pb.go b/internal/iam/store/role_grant.pb.go index f9628ccd1..ab3ae6981 100644 --- a/internal/iam/store/role_grant.pb.go +++ b/internal/iam/store/role_grant.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/role_grant.proto package store diff --git a/internal/iam/store/scope.pb.go b/internal/iam/store/scope.pb.go index 67b1d8dc6..c62eca81d 100644 --- a/internal/iam/store/scope.pb.go +++ b/internal/iam/store/scope.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/scope.proto package store diff --git a/internal/iam/store/user.pb.go b/internal/iam/store/user.pb.go index 7b082108b..aa13b1617 100644 --- a/internal/iam/store/user.pb.go +++ b/internal/iam/store/user.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/iam/store/v1/user.proto package store diff --git a/internal/kms/store/database_key.pb.go b/internal/kms/store/database_key.pb.go index 383f78cb0..1bcf2f832 100644 --- a/internal/kms/store/database_key.pb.go +++ b/internal/kms/store/database_key.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/kms/store/v1/database_key.proto package store diff --git a/internal/kms/store/oidc_key.pb.go b/internal/kms/store/oidc_key.pb.go index 637fb14e3..c4441b6d4 100644 --- a/internal/kms/store/oidc_key.pb.go +++ b/internal/kms/store/oidc_key.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/kms/store/v1/oidc_key.proto package store diff --git a/internal/kms/store/oplog_key.pb.go b/internal/kms/store/oplog_key.pb.go index 06f5f210c..0d7437e41 100644 --- a/internal/kms/store/oplog_key.pb.go +++ b/internal/kms/store/oplog_key.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/kms/store/v1/oplog_key.proto package store diff --git a/internal/kms/store/root_key.pb.go b/internal/kms/store/root_key.pb.go index 8bcadaa04..31c305583 100644 --- a/internal/kms/store/root_key.pb.go +++ b/internal/kms/store/root_key.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/kms/store/v1/root_key.proto package store diff --git a/internal/kms/store/session_key.pb.go b/internal/kms/store/session_key.pb.go index dd015c77b..91ef2b725 100644 --- a/internal/kms/store/session_key.pb.go +++ b/internal/kms/store/session_key.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/kms/store/v1/session_key.proto package store diff --git a/internal/kms/store/token_key.pb.go b/internal/kms/store/token_key.pb.go index 993c6efd7..b60435a1b 100644 --- a/internal/kms/store/token_key.pb.go +++ b/internal/kms/store/token_key.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/kms/store/v1/token_key.proto package store diff --git a/internal/oplog/any_operation.pb.go b/internal/oplog/any_operation.pb.go index d6b97e41d..0aeef607c 100644 --- a/internal/oplog/any_operation.pb.go +++ b/internal/oplog/any_operation.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/oplog/v1/any_operation.proto package oplog import ( - field_mask "google.golang.org/genproto/protobuf/field_mask" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + fieldmaskpb "google.golang.org/protobuf/types/known/fieldmaskpb" reflect "reflect" sync "sync" ) @@ -93,9 +93,9 @@ type AnyOperation struct { // operation_type defines the type of database operation. OperationType OpType `protobuf:"varint,3,opt,name=operation_type,json=operationType,proto3,enum=controller.storage.oplog.v1.OpType" json:"operation_type,omitempty"` // field_mask is the mask of fields to update. - FieldMask *field_mask.FieldMask `protobuf:"bytes,4,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"` + FieldMask *fieldmaskpb.FieldMask `protobuf:"bytes,4,opt,name=field_mask,json=fieldMask,proto3" json:"field_mask,omitempty"` // null_mask is the mask of fields to set to null. - NullMask *field_mask.FieldMask `protobuf:"bytes,5,opt,name=null_mask,json=nullMask,proto3" json:"null_mask,omitempty"` + NullMask *fieldmaskpb.FieldMask `protobuf:"bytes,5,opt,name=null_mask,json=nullMask,proto3" json:"null_mask,omitempty"` } func (x *AnyOperation) Reset() { @@ -151,14 +151,14 @@ func (x *AnyOperation) GetOperationType() OpType { return OpType_OP_TYPE_UNSPECIFIED } -func (x *AnyOperation) GetFieldMask() *field_mask.FieldMask { +func (x *AnyOperation) GetFieldMask() *fieldmaskpb.FieldMask { if x != nil { return x.FieldMask } return nil } -func (x *AnyOperation) GetNullMask() *field_mask.FieldMask { +func (x *AnyOperation) GetNullMask() *fieldmaskpb.FieldMask { if x != nil { return x.NullMask } @@ -219,9 +219,9 @@ func file_controller_storage_oplog_v1_any_operation_proto_rawDescGZIP() []byte { var file_controller_storage_oplog_v1_any_operation_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_controller_storage_oplog_v1_any_operation_proto_msgTypes = make([]protoimpl.MessageInfo, 1) var file_controller_storage_oplog_v1_any_operation_proto_goTypes = []interface{}{ - (OpType)(0), // 0: controller.storage.oplog.v1.OpType - (*AnyOperation)(nil), // 1: controller.storage.oplog.v1.AnyOperation - (*field_mask.FieldMask)(nil), // 2: google.protobuf.FieldMask + (OpType)(0), // 0: controller.storage.oplog.v1.OpType + (*AnyOperation)(nil), // 1: controller.storage.oplog.v1.AnyOperation + (*fieldmaskpb.FieldMask)(nil), // 2: google.protobuf.FieldMask } var file_controller_storage_oplog_v1_any_operation_proto_depIdxs = []int32{ 0, // 0: controller.storage.oplog.v1.AnyOperation.operation_type:type_name -> controller.storage.oplog.v1.OpType diff --git a/internal/oplog/oplog_test/oplog_test.pb.go b/internal/oplog/oplog_test/oplog_test.pb.go index e0956310b..cef6c95ae 100644 --- a/internal/oplog/oplog_test/oplog_test.pb.go +++ b/internal/oplog/oplog_test/oplog_test.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/oplog/test/v1/oplog_test.proto // define a test proto package diff --git a/internal/oplog/store/oplog.pb.go b/internal/oplog/store/oplog.pb.go index a0884aae1..8b7739e78 100644 --- a/internal/oplog/store/oplog.pb.go +++ b/internal/oplog/store/oplog.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/oplog/store/v1/oplog.proto // define an oplog package within the boundary controller diff --git a/internal/proxy/proxy.pb.go b/internal/proxy/proxy.pb.go index 1fe1289cb..b414f02ab 100644 --- a/internal/proxy/proxy.pb.go +++ b/internal/proxy/proxy.pb.go @@ -1,15 +1,15 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: worker/proxy/v1/proxy.proto package proxy import ( - timestamp "github.com/golang/protobuf/ptypes/timestamp" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + timestamppb "google.golang.org/protobuf/types/known/timestamppb" reflect "reflect" sync "sync" ) @@ -129,9 +129,9 @@ type HandshakeResult struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Expiration *timestamp.Timestamp `protobuf:"bytes,10,opt,name=expiration,proto3" json:"expiration,omitempty"` - ConnectionLimit int32 `protobuf:"varint,20,opt,name=connection_limit,json=connectionLimit,proto3" json:"connection_limit,omitempty"` - ConnectionsLeft int32 `protobuf:"varint,30,opt,name=connections_left,json=connectionsLeft,proto3" json:"connections_left,omitempty"` + Expiration *timestamppb.Timestamp `protobuf:"bytes,10,opt,name=expiration,proto3" json:"expiration,omitempty"` + ConnectionLimit int32 `protobuf:"varint,20,opt,name=connection_limit,json=connectionLimit,proto3" json:"connection_limit,omitempty"` + ConnectionsLeft int32 `protobuf:"varint,30,opt,name=connections_left,json=connectionsLeft,proto3" json:"connections_left,omitempty"` } func (x *HandshakeResult) Reset() { @@ -166,7 +166,7 @@ func (*HandshakeResult) Descriptor() ([]byte, []int) { return file_worker_proxy_v1_proxy_proto_rawDescGZIP(), []int{1} } -func (x *HandshakeResult) GetExpiration() *timestamp.Timestamp { +func (x *HandshakeResult) GetExpiration() *timestamppb.Timestamp { if x != nil { return x.Expiration } @@ -239,10 +239,10 @@ func file_worker_proxy_v1_proxy_proto_rawDescGZIP() []byte { var file_worker_proxy_v1_proxy_proto_enumTypes = make([]protoimpl.EnumInfo, 1) var file_worker_proxy_v1_proxy_proto_msgTypes = make([]protoimpl.MessageInfo, 2) var file_worker_proxy_v1_proxy_proto_goTypes = []interface{}{ - (HANDSHAKECOMMAND)(0), // 0: worker.proxy.v1.HANDSHAKECOMMAND - (*ClientHandshake)(nil), // 1: worker.proxy.v1.ClientHandshake - (*HandshakeResult)(nil), // 2: worker.proxy.v1.HandshakeResult - (*timestamp.Timestamp)(nil), // 3: google.protobuf.Timestamp + (HANDSHAKECOMMAND)(0), // 0: worker.proxy.v1.HANDSHAKECOMMAND + (*ClientHandshake)(nil), // 1: worker.proxy.v1.ClientHandshake + (*HandshakeResult)(nil), // 2: worker.proxy.v1.HandshakeResult + (*timestamppb.Timestamp)(nil), // 3: google.protobuf.Timestamp } var file_worker_proxy_v1_proxy_proto_depIdxs = []int32{ 0, // 0: worker.proxy.v1.ClientHandshake.command:type_name -> worker.proxy.v1.HANDSHAKECOMMAND diff --git a/internal/servers/servers.pb.go b/internal/servers/servers.pb.go index 71b85d4e1..aa553b4a1 100644 --- a/internal/servers/servers.pb.go +++ b/internal/servers/servers.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/servers/v1/servers.proto package servers diff --git a/internal/target/store/target.pb.go b/internal/target/store/target.pb.go index e7ddffe75..234c038d9 100644 --- a/internal/target/store/target.pb.go +++ b/internal/target/store/target.pb.go @@ -1,7 +1,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: // protoc-gen-go v1.26.0 -// protoc v3.12.4 +// protoc v3.15.5 // source: controller/storage/target/store/v1/target.proto package store