Merge pull request #4920 from TheThingsNetwork/feature/backport-gs-is…

…-fixes
TheThingsNetwork · Nov 26, 2021 · 4f3c7cd · 4f3c7cd
2 parents 0b26184 + 395e4a6
commit 4f3c7cd
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 39 deletions.
diff --git a/api/api.md b/api/api.md
@@ -3945,7 +3945,7 @@ Connection stats as monitored by the Gateway Server.
 | `versions` | <p>`map.max_pairs`: `10`</p><p>`map.keys.string.max_len`: `36`</p><p>`map.keys.string.pattern`: `^[a-z0-9](?:[_-]?[a-z0-9]){2,}$`</p><p>`map.values.string.max_len`: `128`</p> |
 | `antenna_locations` | <p>`repeated.max_items`: `8`</p> |
 | `ip` | <p>`repeated.max_items`: `10`</p><p>`repeated.items.string.ip`: `true`</p> |
-| `metrics` | <p>`map.max_pairs`: `10`</p><p>`map.keys.string.max_len`: `36`</p><p>`map.keys.string.pattern`: `^[a-z0-9](?:[_-]?[a-z0-9]){2,}$`</p> |
+| `metrics` | <p>`map.max_pairs`: `32`</p><p>`map.keys.string.max_len`: `36`</p><p>`map.keys.string.pattern`: `^[a-z0-9](?:[_-]?[a-z0-9]){2,}$`</p> |
 
 ### <a name="ttn.lorawan.v3.GatewayStatus.MetricsEntry">Message `GatewayStatus.MetricsEntry`</a>
 

diff --git a/api/gateway.proto b/api/gateway.proto
@@ -352,7 +352,7 @@ message GatewayStatus {
   // - map keys are written in snake_case
   map<string,float> metrics = 6 [
     (validate.rules).map = {
-      max_pairs: 10,
+      max_pairs: 32,
       keys: { string: { pattern: "^[a-z0-9](?:[_-]?[a-z0-9]){2,}$", max_len: 36 } },
     }
   ];

diff --git a/pkg/identityserver/gateway_registry.go b/pkg/identityserver/gateway_registry.go
@@ -444,9 +444,9 @@ func (is *IdentityServer) listGateways(ctx context.Context, req *ttnpb.ListGatew
 func (is *IdentityServer) updateGateway(ctx context.Context, req *ttnpb.UpdateGatewayRequest) (gtw *ttnpb.Gateway, err error) {
 	reqGtw := req.GetGateway()
 	if err = rights.RequireGateway(ctx, *reqGtw.GetIds(), ttnpb.RIGHT_GATEWAY_SETTINGS_BASIC); err != nil {
-		// Allow setting only the location field with the RIGHT_GATEWAY_LINK right.
+		// Allow setting the location field or the attributes field with the RIGHT_GATEWAY_LINK right.
 		isLink := rights.RequireGateway(ctx, *reqGtw.GetIds(), ttnpb.RIGHT_GATEWAY_LINK) == nil
-		if topLevel := ttnpb.TopLevelFields(req.FieldMask.GetPaths()); !isLink || len(topLevel) != 1 || topLevel[0] != "antennas" {
+		if !(isLink && ttnpb.HasOnlyAllowedFields(req.FieldMask.GetPaths(), "antennas", "attributes")) {
 			return nil, err
 		}
 	}

diff --git a/pkg/ttnpb/gateway.pb.go b/pkg/ttnpb/gateway.pb.go
diff --git a/pkg/ttnpb/gateway.pb.validate.go b/pkg/ttnpb/gateway.pb.validate.go
diff --git a/sdk/js/generated/api.json b/sdk/js/generated/api.json
@@ -17896,7 +17896,7 @@
                 "validate.rules": [
                   {
                     "name": "map.max_pairs",
-                    "value": 10
+                    "value": 32
                   },
                   {
                     "name": "map.keys.string.max_len",