allow regex replacement in ResourceBehavior.IdentityInV1API

docs/operators/config.md

@@ -152,6 +152,16 @@ resource_behavior:
  - { resource: compute/instances_baremetal_large, identity_in_v1_api: compute/instances_thebigbox }
 ```
 
+The fields `category` and `identity_in_v1_api` can be templated with placeholders `$1`, `$2`, etc., which will be filled with the respective match groups from the `resource` regex. For example:
+
+```yaml
+resource_behavior:
+ # this entire service was renamed
+ - { resource: 'volumev2/(.*)', identity_in_v1_api: 'cinder/$1' }
+ # this service contains sets of resources for each share type
+ - { resource: 'manila/(shares|snapshots|share_capacity|snapshot_capacity)_(.+)', category: 'share_type_$2' }
+```
+
 #### Resource renaming
 
 Limes provides amenities for renaming and restructuring services and resources in a way where the backwards-incompatible

internal/core/cluster.go

@@ -203,7 +203,7 @@ func (c *Cluster) BehaviorForResource(serviceType db.ServiceType, resourceName l
  fullName := string(serviceType) + "/" + string(resourceName)
  for _, behavior := range c.Config.ResourceBehaviors {
  if behavior.FullResourceNameRx.MatchString(fullName) {
- result.Merge(behavior)
+ result.Merge(behavior, fullName)
  }
  }
 

internal/core/resource_behavior.go

@@ -95,7 +95,7 @@ func (b ResourceBehavior) BuildAPIResourceInfo(resName limesresources.ResourceNa
 }
 
 // Merge computes the union of both given resource behaviors.
-func (b *ResourceBehavior) Merge(other ResourceBehavior) {
+func (b *ResourceBehavior) Merge(other ResourceBehavior, fullResourceName string) {
  if other.OvercommitFactor != 0 {
  b.OvercommitFactor = other.OvercommitFactor
  }
@@ -114,19 +114,37 @@ func (b *ResourceBehavior) Merge(other ResourceBehavior) {
  }
  }
  if other.IdentityInV1API != (ResourceRef{}) {
- b.IdentityInV1API = other.IdentityInV1API
+ b.IdentityInV1API.ServiceType = interpolateFromResourceNameMatch(other, other.IdentityInV1API.ServiceType, fullResourceName)
+ b.IdentityInV1API.ResourceName = interpolateFromResourceNameMatch(other, other.IdentityInV1API.ResourceName, fullResourceName)
  }
  if !other.TranslationRuleInV1API.IsEmpty() {
  b.TranslationRuleInV1API = other.TranslationRuleInV1API
  }
  if other.Category != "" {
- b.Category = other.Category
+ b.Category = interpolateFromResourceNameMatch(other, other.Category, fullResourceName)
  }
  if other.CommitmentConversion != (CommitmentConversion{}) {
  b.CommitmentConversion = other.CommitmentConversion
  }
 }
 
+func interpolateFromResourceNameMatch[S ~string](b ResourceBehavior, value S, fullResourceName string) S {
+ if !strings.Contains(string(value), "$") {
+ return value
+ }
+ rx, err := b.FullResourceNameRx.Regexp()
+ if err != nil {
+ // defense in depth: this should not happen because the regex should have been validated at UnmarshalYAML time
+ return value
+ }
+ match := rx.FindStringSubmatchIndex(fullResourceName)
+ if match == nil {
+ // defense in depth: this should not happen because this is only called after the resource name has already matched
+ return value
+ }
+ return S(rx.ExpandString(nil, string(value), fullResourceName, match))
+}
+
 // ResourceRef contains a pair of service type and resource name using API-level identifiers.
 // When read from the configuration YAML, this deserializes from a string in the "service/resource" format.
 type ResourceRef struct {

internal/datamodel/quota_overrides_test.go

@@ -53,8 +53,8 @@ const (
  resource_behavior:
  - resource: first/capacity
  identity_in_v1_api: capacities/first
- - resource: first/things
- identity_in_v1_api: things/first
+ - resource: (first)/thi(ngs)
+ identity_in_v1_api: thi$2/$1
  `
 )