Introduce update and delete methods to the AttributeStore (#122)

Author: suresh-prakash

hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeIdentifier.java

@@ -0,0 +1,13 @@
+package org.hypertrace.core.graphql.attributes;
+
+import lombok.Builder;
+import lombok.Value;
+import lombok.experimental.Accessors;
+
+@Value
+@Builder
+@Accessors(fluent = true)
+public class AttributeIdentifier {
+  String scope;
+  String key;
+}

hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeStore.java

@@ -17,4 +17,11 @@ Single<AttributeModel> getForeignIdAttribute(
       GraphQlRequestContext context, String scope, String foreignScope);
 
   Completable create(final GraphQlRequestContext context, final List<AttributeMetadata> attributes);
+
+  Completable delete(final GraphQlRequestContext context, final AttributeIdentifier identifier);
+
+  Single<AttributeModel> update(
+      final GraphQlRequestContext context,
+      final AttributeIdentifier identifier,
+      final AttributeUpdate update);
 }

hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/AttributeUpdate.java

@@ -0,0 +1,49 @@
+package org.hypertrace.core.graphql.attributes;
+
+import static java.util.stream.Collectors.toUnmodifiableList;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import javax.annotation.Nullable;
+import lombok.Builder;
+import lombok.Value;
+import lombok.experimental.Accessors;
+import org.hypertrace.core.attribute.service.v1.Update;
+
+@Value
+@Builder
+@Accessors(fluent = true)
+public class AttributeUpdate {
+  private static final List<UpdateMapper<?>> MAPPER_LIST =
+      List.of(new UpdateMapper<>(AttributeUpdate::displayName, Update.Builder::setDisplayName));
+
+  @Nullable String displayName;
+
+  List<Update> buildUpdates() {
+    return MAPPER_LIST.stream()
+        .map(mapper -> mapper.apply(this))
+        .flatMap(Optional::stream)
+        .collect(toUnmodifiableList());
+  }
+
+  @Value
+  private static class UpdateMapper<T> implements Function<AttributeUpdate, Optional<Update>> {
+    Function<AttributeUpdate, T> valueAccessor;
+    BiFunction<Update.Builder, T, Update.Builder> valueSetter;
+
+    @Override
+    public Optional<Update> apply(final AttributeUpdate attributeUpdate) {
+      final T value = valueAccessor.apply(attributeUpdate);
+      if (Objects.isNull(value)) {
+        return Optional.empty();
+      }
+
+      final Update.Builder builder = Update.newBuilder();
+      final Update update = valueSetter.apply(builder, value).build();
+      return Optional.of(update);
+    }
+  }
+}

hypertrace-core-graphql-attribute-store/src/main/java/org/hypertrace/core/graphql/attributes/CachingAttributeStore.java

@@ -9,6 +9,7 @@
 import javax.inject.Singleton;
 import org.hypertrace.core.attribute.service.cachingclient.CachingAttributeClient;
 import org.hypertrace.core.attribute.service.v1.AttributeMetadata;
+import org.hypertrace.core.attribute.service.v1.AttributeMetadataFilter;
 import org.hypertrace.core.graphql.context.GraphQlRequestContext;
 import org.hypertrace.core.graphql.spi.config.GraphQlServiceConfig;
 import org.hypertrace.core.graphql.utils.grpc.GrpcChannelRegistry;
@@ -94,6 +95,32 @@ public Completable create(
         .call(() -> cachingAttributeClient.create(attributes));
   }
 
+  @Override
+  public Completable delete(
+      final GraphQlRequestContext context, final AttributeIdentifier identifier) {
+    return this.grpcContextBuilder
+        .build(context)
+        .call(() -> cachingAttributeClient.delete(buildFilter(identifier)));
+  }
+
+  @Override
+  public Single<AttributeModel> update(
+      final GraphQlRequestContext context,
+      final AttributeIdentifier identifier,
+      final AttributeUpdate update) {
+    final Single<AttributeModel> metadataSingle =
+        get(context, identifier.scope(), identifier.key());
+    return metadataSingle.flatMap(
+        metadata ->
+            this.grpcContextBuilder
+                .build(context)
+                .call(() -> cachingAttributeClient.update(metadata.id(), update.buildUpdates()))
+                .mapOptional(translator::translate)
+                .switchIfEmpty(
+                    Single.error(
+                        this.buildErrorForMissingAttribute(identifier.scope(), identifier.key()))));
+  }
+
   private Single<String> getForeignIdKey(
       GraphQlRequestContext context, String scope, String foreignScope) {
     return this.idLookup
@@ -125,4 +152,11 @@ private NoSuchElementException buildErrorForMissingIdMapping(String scope) {
     return new NoSuchElementException(
         String.format("No id attribute registered for scope '%s'", scope));
   }
+
+  private AttributeMetadataFilter buildFilter(final AttributeIdentifier filter) {
+    return AttributeMetadataFilter.newBuilder()
+        .addKey(filter.key())
+        .addScopeString(filter.scope())
+        .build();
+  }
 }

hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/ColumnIdentifierExpressionConverter.java

@@ -0,0 +1,26 @@
+package org.hypertrace.core.graphql.utils.gateway;
+
+import io.reactivex.rxjava3.core.Single;
+import javax.inject.Inject;
+import org.hypertrace.core.graphql.attributes.AttributeModel;
+import org.hypertrace.core.graphql.common.utils.Converter;
+import org.hypertrace.gateway.service.v1.common.Expression;
+import org.hypertrace.gateway.service.v1.common.Expression.Builder;
+
+class ColumnIdentifierExpressionConverter implements Converter<AttributeModel, Expression> {
+
+  private final ColumnIdentifierConverter constantConverter;
+
+  @Inject
+  public ColumnIdentifierExpressionConverter(final ColumnIdentifierConverter constantConverter) {
+    this.constantConverter = constantConverter;
+  }
+
+  @Override
+  public Single<Expression> convert(final AttributeModel model) {
+    return this.constantConverter
+        .convert(model)
+        .map(Expression.newBuilder()::setColumnIdentifier)
+        .map(Builder::build);
+  }
+}

hypertrace-core-graphql-gateway-service-utils/src/main/java/org/hypertrace/core/graphql/utils/gateway/GatewayUtilsModule.java

@@ -61,6 +61,8 @@ protected void configure() {
 
     bind(Key.get(new TypeLiteral<Converter<AttributeModel, ColumnIdentifier>>() {}))
         .to(ColumnIdentifierConverter.class);
+    bind(Key.get(new TypeLiteral<Converter<AttributeModel, Expression>>() {}))
+        .to(ColumnIdentifierExpressionConverter.class);
     bind(Key.get(
             new TypeLiteral<Converter<AttributeAssociation<AttributeExpression>, Expression>>() {}))
         .to(AttributeExpressionConverter.class);

hypertrace-core-graphql-platform/build.gradle.kts

@@ -6,7 +6,7 @@ javaPlatform {
   allowDependencies()
 }
 
-val attributeServiceVersion: String = "0.14.13"
+val attributeServiceVersion: String = "0.14.14"
 
 dependencies {
   api(platform("io.grpc:grpc-bom:1.47.0"))
@@ -16,7 +16,7 @@ dependencies {
     api("org.hypertrace.core.grpcutils:grpc-client-utils:0.8.2")
     api("org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.8.2")
     api("org.hypertrace.core.grpcutils:grpc-client-rx-utils:0.8.2")
-    api("org.hypertrace.gateway.service:gateway-service-api:0.2.15")
+    api("org.hypertrace.gateway.service:gateway-service-api:0.2.20")
     api("org.hypertrace.core.attribute.service:caching-attribute-service-client:${attributeServiceVersion}")
     api("org.hypertrace.core.attribute.service:attribute-service-api:${attributeServiceVersion}")