chore(tools): add to resource-gen.go generation of kumactl options (#…

…2469) (#2504)

This removes some more manually written code that currently
makes policy creation error prone

Signed-off-by: Charly Molter <charly.molter@konghq.com>
(cherry picked from commit aa0bd89)

Co-authored-by: Charly Molter <charly.molter@konghq.com>

api/mesh/options.proto

@@ -13,7 +13,7 @@ message KumaResourceOptions {
   // Name and value of the modelResourceType constant.
   string type = 2;
 
-  // True if this resoure has global scope. Otherwise it will be mesh scope.
+  // True if this resource has global scope. Otherwise it will be mesh scope.
   bool global = 3;
 
   // Name of the resource's Go package.
@@ -24,6 +24,8 @@ message KumaResourceOptions {
 
   // Whether to skip type registration for this resource.
   bool skip_registration = 6;
+
+  KumaWsOptions ws = 7;
 }
 
 message KumaWsOptions {
@@ -41,5 +43,4 @@ message KumaWsOptions {
 
 extend google.protobuf.MessageOptions {
   KumaResourceOptions resource = 43534533; // 'kuma'
-  KumaWsOptions ws = 43534534;
 }

api/mesh/v1alpha1/circuit_breaker.proto

@@ -22,7 +22,7 @@ message CircuitBreaker {
   option (kuma.mesh.resource).name = "CircuitBreakerResource";
   option (kuma.mesh.resource).type = "CircuitBreaker";
   option (kuma.mesh.resource).package = "mesh";
-  option (kuma.mesh.ws).name = "circuit-breaker";
+  option (kuma.mesh.resource).ws.name = "circuit-breaker";
 
   // List of selectors to match dataplanes that are sources of traffic.
   repeated Selector sources = 1;

api/mesh/v1alpha1/dataplane.proto

@@ -16,7 +16,7 @@ message Dataplane {
   option (kuma.mesh.resource).name = "DataplaneResource";
   option (kuma.mesh.resource).type = "Dataplane";
   option (kuma.mesh.resource).package = "mesh";
-  option (kuma.mesh.ws).name = "dataplane";
+  option (kuma.mesh.resource).ws.name = "dataplane";
 
   // Networking describes inbound and outbound interfaces of a dataplane.
   message Networking {