Update protos, generated code, and service handlers (#2188)

* Update protos, generated code, and service handlers

* Address review feedback

internal/proto/controller/api/resources/workers/v1/worker.proto

@@ -10,18 +10,6 @@ import "google/protobuf/wrappers.proto";
 
 option go_package = "github.com/hashicorp/boundary/sdk/pbs/controller/api/resources/workers;workers";
 
-// WorkerProvidedConfiguration contains configuration values reported by the worker daemon.
-message WorkerProvidedConfiguration {
-  // Output only.  The address the worker daemon reports itself as reachable at.
-  string address = 10;
-
-  // Output only.  The name the worker daemon reports itself having.
-  string name = 20;
-
-  // Output only. The tags reporteed by the worker daemon.
-  map<string, google.protobuf.ListValue> tags = 40;
-}
-
 // Worker contains all fields related to a Worker resource
 message Worker {
   // Output only. The ID of the User.
@@ -33,7 +21,8 @@ message Worker {
   // Output only. Scope information for this resource.
   resources.scopes.v1.ScopeInfo scope = 30;
 
-  // Optional name for identification purposes.
+  // Optional name for identification purposes. Can only be set through the API
+  // for `pki`-type workers; read-only for `kms`-type workers.
   google.protobuf.StringValue name = 40 [
     (custom_options.v1.generate_sdk_option) = true,
     (custom_options.v1.mask_mapping) = {
@@ -42,7 +31,8 @@ message Worker {
     }
   ]; // @gotags: `class:"sensitive"`
 
-  // Optional user-set description for identification purposes.
+  // Optional user-set description for identification purposes. Can only be set
+  // through the API for `pki`-type workers; read-only for `kms`-type workers.
   google.protobuf.StringValue description = 50 [
     (custom_options.v1.generate_sdk_option) = true,
     (custom_options.v1.mask_mapping) = {
@@ -61,34 +51,20 @@ message Worker {
   // The mutation will fail if the version does not match the latest known good version.
   uint32 version = 80; // @gotags: `class:"public"`
 
-  // The address that this worker is reachable at.
-  google.protobuf.StringValue address = 90 [
-    (custom_options.v1.generate_sdk_option) = true,
-    (custom_options.v1.mask_mapping) = {
-      this: "address"
-      that: "address"
-    }
-  ]; // @gotags: `class:"public"`
+  // Output only. The address that this worker is reachable at, as sourced from
+  // the worker's configuration file.
+  string address = 90; // @gotags: `class:"public"`
 
-  // Output only.  This is the address used by authorized session.  The value
-  // is the same as the address field if set. Otherwise it uses the address the
-  // worker reports.
-  string canonical_address = 100 [json_name = "canonical_address"]; // @gotags: `class:"public"`
-
-  // Output only. The tags attached to this worker.
-  map<string, google.protobuf.ListValue> tags = 110; // @gotags: `class:"public"`
-
-  // Output only. The deduplicated union of the tags reported by the worker and
-  // the tags added through the user facing api.  This is used when applying
-  // worker filters.
+  // Output only. The deduplicated union of the tags reported by the worker from
+  // its configuration and any tags added through other means.  This is used
+  // when applying worker filters.
   map<string, google.protobuf.ListValue> canonical_tags = 120 [json_name = "canonical_tags"]; // @gotags: `class:"public"`
 
-  // Output only. The time this worker daemon last reported its status.
-  google.protobuf.Timestamp last_status_time = 130 [json_name = "last_status_time"]; // @gotags: `class:"public"`
+  // Output only. The tags set in the worker's configuration file.
+  map<string, google.protobuf.ListValue> config_tags = 130 [json_name = "config_tags"]; // @gotags: `class:"public"`
 
-  // Output only. The set of information the worker daemon has reported about
-  // itself.
-  WorkerProvidedConfiguration worker_provided_configuration = 140 [json_name = "worker_provided_configuration"];
+  // Output only. The time this worker daemon last reported its status.
+  google.protobuf.Timestamp last_status_time = 140 [json_name = "last_status_time"]; // @gotags: `class:"public"`
 
   // worker_generated_auth_token is input only. Supports the worker led node
   // enrollment flow where this credentials token is produced by a worker. This
@@ -99,6 +75,10 @@ message Worker {
   // Output only. The number of connections that this worker is currently handling.
   uint32 active_connection_count = 160 [json_name = "active_connection_count"]; // @gotags: `class:"public"`
 
+  // Output only. The type of the worker, denoted by how it authenticates: `pki`
+  // or `kms`.
+  string type = 170;
+
   // Output only. The available actions on this resource for the requester.
   repeated string authorized_actions = 300 [json_name = "authorized_actions"]; // @gotags: `class:"public"`
 }