From 2d4a0697db53cc812c66969374d8efe3b5466bb6 Mon Sep 17 00:00:00 2001 From: Sepehr Date: Tue, 21 May 2024 21:41:55 +0000 Subject: [PATCH 1/4] backport of commit 2e961fecfe96ea67fd88289973d0a3dcafe5b64b --- .../resources/storagebuckets/v1/storage_bucket.proto | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto b/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto index a5a271e7ec..9f692fe52d 100644 --- a/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto +++ b/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto @@ -17,10 +17,10 @@ option go_package = "github.com/hashicorp/boundary/sdk/pbs/controller/api/resour // StorageBucket manages external object stores message StorageBucket { // Output only. The ID of the storage bucket. - string id = 10; // @gotags: `class:"public"` + string id = 10; // @gotags: `class:"public" eventstream:"observation"` // The ID of the Scope of which this storage bucket is a part. - string scope_id = 20 [json_name = "scope_id"]; // @gotags: `class:"public"` + string scope_id = 20 [json_name = "scope_id"]; // @gotags: `class:"public" eventstream:"observation"` // Output only. Scope information for this resource. resources.scopes.v1.ScopeInfo scope = 30; // @gotags: `class:"public"` @@ -29,7 +29,7 @@ message StorageBucket { string plugin_id = 34 [ json_name = "plugin_id", (custom_options.v1.generate_sdk_option) = true - ]; // @gotags: `class:"public"` + ]; // @gotags: `class:"public" eventstream:"observation"` // Output only. Plugin information for this resource. resources.plugins.v1.PluginInfo plugin = 35; // @gotags: `class:"public"` @@ -65,7 +65,7 @@ message StorageBucket { ]; // @gotags: `class:"public"` // Output only. The time this resource was created. - google.protobuf.Timestamp created_time = 80 [json_name = "created_time"]; // @gotags: `class:"public"` + google.protobuf.Timestamp created_time = 80 [json_name = "created_time"]; // @gotags: `class:"public" eventstream:"observation"` // Output only. The time this resource was last updated. google.protobuf.Timestamp updated_time = 90 [json_name = "updated_time"]; // @gotags: `class:"secret"` @@ -75,7 +75,7 @@ message StorageBucket { uint32 version = 100; // @gotags: `class:"public"` // The type of Storage Bucket (currently only plugin). - string type = 110; // @gotags: `class:"public"` + string type = 110; // @gotags: `class:"public" eventstream:"observation"` // Attributes specific to the catalog type. google.protobuf.Struct attributes = 120 [(custom_options.v1.generate_sdk_option) = true]; // @gotags: `class:"public"` From 5882869bdca2a7f441df08cd83345f7db80eb9fe Mon Sep 17 00:00:00 2001 From: Sepehr Date: Tue, 21 May 2024 21:45:38 +0000 Subject: [PATCH 2/4] backport of commit dcda05d83fd66d49a0ebbe276e515abb1b8ce47c --- .../api/services/v1/storage_bucket_service.proto | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/proto/controller/api/services/v1/storage_bucket_service.proto b/internal/proto/controller/api/services/v1/storage_bucket_service.proto index f8d2017292..88b9b63bd0 100644 --- a/internal/proto/controller/api/services/v1/storage_bucket_service.proto +++ b/internal/proto/controller/api/services/v1/storage_bucket_service.proto @@ -84,7 +84,7 @@ service StorageBucketService { } message GetStorageBucketRequest { - string id = 1; // @gotags: `class:"public"` + string id = 1; // @gotags: `class:"public" eventstream:"observation"` } message GetStorageBucketResponse { @@ -92,8 +92,8 @@ message GetStorageBucketResponse { } message ListStorageBucketsRequest { - string scope_id = 1 [json_name = "scope_id"]; // @gotags: `class:"public"` - bool recursive = 20 [json_name = "recursive"]; // @gotags: `class:"public"` + string scope_id = 1 [json_name = "scope_id"]; // @gotags: `class:"public" eventstream:"observation"` + bool recursive = 20 [json_name = "recursive"]; // @gotags: `class:"public" eventstream:"observation"` // You can specify that the filter should only return items that match. // Refer to [filter expressions](https://developer.hashicorp.com/boundary/docs/concepts/filtering) for more information. string filter = 30 [json_name = "filter"]; // @gotags: `class:"public"` @@ -142,12 +142,12 @@ message CreateStorageBucketRequest { } message CreateStorageBucketResponse { - string uri = 1; // @gotags: `class:"public"` + string uri = 1; // @gotags: `class:"public" eventstream:"observation"` api.resources.storagebuckets.v1.StorageBucket item = 2; } message UpdateStorageBucketRequest { - string id = 1; // @gotags: `class:"public"` + string id = 1; // @gotags: `class:"public" eventstream:"observation"` api.resources.storagebuckets.v1.StorageBucket item = 2; google.protobuf.FieldMask update_mask = 3; } @@ -157,7 +157,7 @@ message UpdateStorageBucketResponse { } message DeleteStorageBucketRequest { - string id = 1; // @gotags: `class:"public"` + string id = 1; // @gotags: `class:"public" eventstream:"observation"` } message DeleteStorageBucketResponse {} From 5c5f409525e825fc57f4e72df0093bc59de38272 Mon Sep 17 00:00:00 2001 From: Sepehr Date: Wed, 22 May 2024 22:14:43 +0000 Subject: [PATCH 3/4] backport of commit 4975381c3f9944d7a4601304e2d9c3ddd2c71cbc --- .../api/services/storage_bucket_service.pb.go | 12 ++++++------ .../resources/storagebuckets/storage_bucket.pb.go | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/internal/gen/controller/api/services/storage_bucket_service.pb.go b/internal/gen/controller/api/services/storage_bucket_service.pb.go index b284ad1e1c..ec39eae76e 100644 --- a/internal/gen/controller/api/services/storage_bucket_service.pb.go +++ b/internal/gen/controller/api/services/storage_bucket_service.pb.go @@ -33,7 +33,7 @@ type GetStorageBucketRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" class:"public"` // @gotags: `class:"public"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` } func (x *GetStorageBucketRequest) Reset() { @@ -127,8 +127,8 @@ type ListStorageBucketsRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ScopeId string `protobuf:"bytes,1,opt,name=scope_id,proto3" json:"scope_id,omitempty" class:"public"` // @gotags: `class:"public"` - Recursive bool `protobuf:"varint,20,opt,name=recursive,proto3" json:"recursive,omitempty" class:"public"` // @gotags: `class:"public"` + ScopeId string `protobuf:"bytes,1,opt,name=scope_id,proto3" json:"scope_id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` + Recursive bool `protobuf:"varint,20,opt,name=recursive,proto3" json:"recursive,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // You can specify that the filter should only return items that match. // Refer to [filter expressions](https://developer.hashicorp.com/boundary/docs/concepts/filtering) for more information. Filter string `protobuf:"bytes,30,opt,name=filter,proto3" json:"filter,omitempty" class:"public"` // @gotags: `class:"public"` @@ -383,7 +383,7 @@ type CreateStorageBucketResponse struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty" class:"public"` // @gotags: `class:"public"` + Uri string `protobuf:"bytes,1,opt,name=uri,proto3" json:"uri,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` Item *storagebuckets.StorageBucket `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` } @@ -438,7 +438,7 @@ type UpdateStorageBucketRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" class:"public"` // @gotags: `class:"public"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` Item *storagebuckets.StorageBucket `protobuf:"bytes,2,opt,name=item,proto3" json:"item,omitempty"` UpdateMask *fieldmaskpb.FieldMask `protobuf:"bytes,3,opt,name=update_mask,json=updateMask,proto3" json:"update_mask,omitempty"` } @@ -548,7 +548,7 @@ type DeleteStorageBucketRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" class:"public"` // @gotags: `class:"public"` + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` } func (x *DeleteStorageBucketRequest) Reset() { diff --git a/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go b/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go index 795f519f27..9f0ce6ad25 100644 --- a/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go +++ b/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go @@ -36,13 +36,13 @@ type StorageBucket struct { unknownFields protoimpl.UnknownFields // Output only. The ID of the storage bucket. - Id string `protobuf:"bytes,10,opt,name=id,proto3" json:"id,omitempty" class:"public"` // @gotags: `class:"public"` + Id string `protobuf:"bytes,10,opt,name=id,proto3" json:"id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // The ID of the Scope of which this storage bucket is a part. - ScopeId string `protobuf:"bytes,20,opt,name=scope_id,proto3" json:"scope_id,omitempty" class:"public"` // @gotags: `class:"public"` + ScopeId string `protobuf:"bytes,20,opt,name=scope_id,proto3" json:"scope_id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // Output only. Scope information for this resource. Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty" class:"public"` // @gotags: `class:"public"` // The ID of the plugin of which this storage bucket is created. - PluginId string `protobuf:"bytes,34,opt,name=plugin_id,proto3" json:"plugin_id,omitempty" class:"public"` // @gotags: `class:"public"` + PluginId string `protobuf:"bytes,34,opt,name=plugin_id,proto3" json:"plugin_id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // Output only. Plugin information for this resource. Plugin *plugins.PluginInfo `protobuf:"bytes,35,opt,name=plugin,proto3" json:"plugin,omitempty" class:"public"` // @gotags: `class:"public"` // Optional name for identification purposes. @@ -54,14 +54,14 @@ type StorageBucket struct { // The prefix used to organize the data held within the external object store. BucketPrefix string `protobuf:"bytes,70,opt,name=bucket_prefix,proto3" json:"bucket_prefix,omitempty" class:"public"` // @gotags: `class:"public"` // Output only. The time this resource was created. - CreatedTime *timestamppb.Timestamp `protobuf:"bytes,80,opt,name=created_time,proto3" json:"created_time,omitempty" class:"public"` // @gotags: `class:"public"` + CreatedTime *timestamppb.Timestamp `protobuf:"bytes,80,opt,name=created_time,proto3" json:"created_time,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // Output only. The time this resource was last updated. UpdatedTime *timestamppb.Timestamp `protobuf:"bytes,90,opt,name=updated_time,proto3" json:"updated_time,omitempty" class:"secret"` // @gotags: `class:"secret"` // 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,100,opt,name=version,proto3" json:"version,omitempty" class:"public"` // @gotags: `class:"public"` // The type of Storage Bucket (currently only plugin). - Type string `protobuf:"bytes,110,opt,name=type,proto3" json:"type,omitempty" class:"public"` // @gotags: `class:"public"` + Type string `protobuf:"bytes,110,opt,name=type,proto3" json:"type,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // Attributes specific to the catalog type. Attributes *structpb.Struct `protobuf:"bytes,120,opt,name=attributes,proto3" json:"attributes,omitempty" class:"public"` // @gotags: `class:"public"` // Secrets specific to the storage bucket type. These are never output. From b8d139c1061761b017710399943904050986c93c Mon Sep 17 00:00:00 2001 From: Sepehr Date: Fri, 24 May 2024 00:38:32 +0000 Subject: [PATCH 4/4] backport of commit 8d197bc4ac43a7d5450b0a938dd40e78a239cf20 --- .../api/resources/storagebuckets/v1/storage_bucket.proto | 4 ++-- .../proto/controller/api/resources/targets/v1/target.proto | 2 +- .../api/resources/storagebuckets/storage_bucket.pb.go | 4 ++-- sdk/pbs/controller/api/resources/targets/target.pb.go | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto b/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto index 9f692fe52d..b8d0c7861d 100644 --- a/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto +++ b/internal/proto/controller/api/resources/storagebuckets/v1/storage_bucket.proto @@ -23,7 +23,7 @@ message StorageBucket { string scope_id = 20 [json_name = "scope_id"]; // @gotags: `class:"public" eventstream:"observation"` // Output only. Scope information for this resource. - resources.scopes.v1.ScopeInfo scope = 30; // @gotags: `class:"public"` + resources.scopes.v1.ScopeInfo scope = 30; // The ID of the plugin of which this storage bucket is created. string plugin_id = 34 [ @@ -32,7 +32,7 @@ message StorageBucket { ]; // @gotags: `class:"public" eventstream:"observation"` // Output only. Plugin information for this resource. - resources.plugins.v1.PluginInfo plugin = 35; // @gotags: `class:"public"` + resources.plugins.v1.PluginInfo plugin = 35; // Optional name for identification purposes. google.protobuf.StringValue name = 40 [ diff --git a/internal/proto/controller/api/resources/targets/v1/target.proto b/internal/proto/controller/api/resources/targets/v1/target.proto index 62ccb4fa48..bd75ccf352 100644 --- a/internal/proto/controller/api/resources/targets/v1/target.proto +++ b/internal/proto/controller/api/resources/targets/v1/target.proto @@ -310,7 +310,7 @@ message SshTargetAttributes { this: "attributes.storage_bucket_id" that: "StorageBucketId" } - ]; // @gotags: `class:"public"` + ]; // @gotags: `class:"public" eventstream:"observation"` // A boolean indicating if session recording has been enabled google.protobuf.BoolValue enable_session_recording = 40 [ diff --git a/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go b/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go index 9f0ce6ad25..d3e3cedd24 100644 --- a/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go +++ b/sdk/pbs/controller/api/resources/storagebuckets/storage_bucket.pb.go @@ -40,11 +40,11 @@ type StorageBucket struct { // The ID of the Scope of which this storage bucket is a part. ScopeId string `protobuf:"bytes,20,opt,name=scope_id,proto3" json:"scope_id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // Output only. Scope information for this resource. - Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty" class:"public"` // @gotags: `class:"public"` + Scope *scopes.ScopeInfo `protobuf:"bytes,30,opt,name=scope,proto3" json:"scope,omitempty"` // The ID of the plugin of which this storage bucket is created. PluginId string `protobuf:"bytes,34,opt,name=plugin_id,proto3" json:"plugin_id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // Output only. Plugin information for this resource. - Plugin *plugins.PluginInfo `protobuf:"bytes,35,opt,name=plugin,proto3" json:"plugin,omitempty" class:"public"` // @gotags: `class:"public"` + Plugin *plugins.PluginInfo `protobuf:"bytes,35,opt,name=plugin,proto3" json:"plugin,omitempty"` // Optional name for identification purposes. Name *wrapperspb.StringValue `protobuf:"bytes,40,opt,name=name,proto3" json:"name,omitempty" class:"public"` // @gotags: `class:"public"` // Optional user-set description for identification purposes. diff --git a/sdk/pbs/controller/api/resources/targets/target.pb.go b/sdk/pbs/controller/api/resources/targets/target.pb.go index 81da3a22a0..9c398214bf 100644 --- a/sdk/pbs/controller/api/resources/targets/target.pb.go +++ b/sdk/pbs/controller/api/resources/targets/target.pb.go @@ -870,7 +870,7 @@ type SshTargetAttributes struct { // The default TCP port that will be listened on by the client's local proxy. DefaultClientPort *wrapperspb.UInt32Value `protobuf:"bytes,20,opt,name=default_client_port,proto3" json:"default_client_port,omitempty" class:"public"` // @gotags: `class:"public"` // PublicId of the storage bucket associated with the target - StorageBucketId *wrapperspb.StringValue `protobuf:"bytes,30,opt,name=storage_bucket_id,proto3" json:"storage_bucket_id,omitempty" class:"public"` // @gotags: `class:"public"` + StorageBucketId *wrapperspb.StringValue `protobuf:"bytes,30,opt,name=storage_bucket_id,proto3" json:"storage_bucket_id,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` // A boolean indicating if session recording has been enabled EnableSessionRecording *wrapperspb.BoolValue `protobuf:"bytes,40,opt,name=enable_session_recording,proto3" json:"enable_session_recording,omitempty" class:"public" eventstream:"observation"` // @gotags: `class:"public" eventstream:"observation"` }