Eliminate Concierge service

.github/workflows/docker-nightly.yml

@@ -80,20 +80,6 @@ jobs:
           push: true
           tags: |
             eclipse/ditto-things:${{ env.IMAGE_TAG }}
-      -
-        name: Build and push ditto-concierge
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: dockerfile-release
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            SERVICE_STARTER=ditto-concierge-service
-            SERVICE_VERSION=0-SNAPSHOT
-          pull: true
-          push: true
-          tags: |
-            eclipse/ditto-concierge:${{ env.IMAGE_TAG }}
       -
         name: Build and push ditto-gateway
         uses: docker/build-push-action@v3

.github/workflows/push-dockerhub.yml

@@ -95,24 +95,6 @@ jobs:
             eclipse/ditto-things:${{ env.IMAGE_MINOR_TAG }}
             eclipse/ditto-things:${{ env.IMAGE_MAJOR_TAG }}
             eclipse/ditto-things:latest
-      -
-        name: Build and push ditto-concierge
-        if: env.MILESTONE_OR_RC_SUFFIX == env.IMAGE_TAG
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: dockerfile-release
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            SERVICE_STARTER=ditto-concierge-service
-            SERVICE_VERSION=${{ env.IMAGE_TAG }}
-          pull: true
-          push: true
-          tags: |
-            eclipse/ditto-concierge:${{ env.IMAGE_TAG }}
-            eclipse/ditto-concierge:${{ env.IMAGE_MINOR_TAG }}
-            eclipse/ditto-concierge:${{ env.IMAGE_MAJOR_TAG }}
-            eclipse/ditto-concierge:latest
       -
         name: Build and push ditto-gateway
         if: env.MILESTONE_OR_RC_SUFFIX == env.IMAGE_TAG
@@ -209,21 +191,6 @@ jobs:
           push: true
           tags: |
             eclipse/ditto-things:${{ env.IMAGE_TAG }}
-      -
-        name: Build and push ditto-concierge milestone/RC
-        if: env.MILESTONE_OR_RC_SUFFIX != env.IMAGE_TAG
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: dockerfile-release
-          platforms: linux/amd64,linux/arm64
-          build-args: |
-            SERVICE_STARTER=ditto-concierge-service
-            SERVICE_VERSION=${{ env.IMAGE_TAG }}
-          pull: true
-          push: true
-          tags: |
-            eclipse/ditto-concierge:${{ env.IMAGE_TAG }}
       -
         name: Build and push ditto-gateway milestone/RC
         if: env.MILESTONE_OR_RC_SUFFIX != env.IMAGE_TAG

.run/Ditto.run.xml

@@ -13,11 +13,10 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Ditto" type="CompoundRunConfigurationType">
     <toRun name="PoliciesService" type="Application" />
-    <toRun name="ConciergeService" type="Application" />
-    <toRun name="ConnectivityService" type="Application" />
+    <toRun name="ThingsService" type="Application" />
     <toRun name="GatewayService" type="Application" />
+    <toRun name="ConnectivityService" type="Application" />
     <toRun name="SearchService" type="Application" />
-    <toRun name="ThingsService" type="Application" />
     <method v="2" />
   </configuration>
-</component>
+</component>

README.md

@@ -118,6 +118,5 @@ You have now running:
    * Things-Search
    * Gateway
    * Connectivity
-   * Concierge
 * an nginx acting as a reverse proxy performing a simple "basic authentication" listening on port `8080`
    * including some static HTTP + API documentation on [http://localhost:8080](http://localhost:8080)

base/api/src/main/java/org/eclipse/ditto/base/api/commands/sudo/SudoCommand.java

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.api.commands.sudo;
+
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * Aggregates all sudo commands in Ditto.
+ *
+ * @param <T> the type of the implementing class.
+ */
+public interface SudoCommand<T extends SudoCommand<T>> extends Command<T> {
+
+    /**
+     * Type qualifier of sudo commands.
+     */
+    String SUDO_TYPE_QUALIFIER = "sudo." + TYPE_QUALIFIER + ":";
+
+    @Override
+    default JsonPointer getResourcePath() {
+        // return empty resource path for SudoCommands as this path is currently not needed for SudoCommands:
+        return JsonPointer.empty();
+    }
+
+    @Override
+    T setDittoHeaders(DittoHeaders dittoHeaders);
+
+}

base/api/src/main/java/org/eclipse/ditto/base/api/commands/sudo/SudoCommandResponse.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.api.commands.sudo;
+
+import org.eclipse.ditto.base.model.headers.DittoHeaders;
+import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.json.JsonPointer;
+
+/**
+ * Aggregates all sudo command responses in Ditto.
+ *
+ * @param <T> the type of the implementing class.
+ */
+public interface SudoCommandResponse<T extends SudoCommandResponse<T>> extends CommandResponse<T> {
+
+    /**
+     * Type qualifier of sudo command responses.
+     */
+    String SUDO_TYPE_QUALIFIER = "sudo." + TYPE_QUALIFIER + ":";
+
+    @Override
+    default JsonPointer getResourcePath() {
+        // return empty resource path for SudoCommandResponses as this path is currently not needed for
+        // SudoCommandResponses:
+        return JsonPointer.empty();
+    }
+
+    @Override
+    T setDittoHeaders(DittoHeaders dittoHeaders);
+
+}

base/api/src/main/java/org/eclipse/ditto/base/api/commands/sudo/SudoQueryCommandResponse.java

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
+ *
+ * See the NOTICE file(s) distributed with this work for additional
+ * information regarding copyright ownership.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ */
+package org.eclipse.ditto.base.api.commands.sudo;
+
+import org.eclipse.ditto.base.model.signals.commands.WithEntity;
+import org.eclipse.ditto.json.JsonValue;
+
+/**
+ * Aggregates all sudo "query" command responses in Ditto.
+ *
+ * @param <T> the type of the implementing class.
+ */
+public interface SudoQueryCommandResponse<T extends SudoQueryCommandResponse<T>> extends SudoCommandResponse<T>,
+        WithEntity<T> {
+
+    @Override
+    T setEntity(JsonValue entity);
+
+}

concierge/service/src/main/java/org/eclipse/ditto/concierge/service/common/package-info.java → base/api/src/main/java/org/eclipse/ditto/base/api/commands/sudo/package-info.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Contributors to the Eclipse Foundation
+ * Copyright (c) 2022 Contributors to the Eclipse Foundation
  *
  * See the NOTICE file(s) distributed with this work for additional
  * information regarding copyright ownership.
@@ -11,4 +11,4 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 @org.eclipse.ditto.utils.jsr305.annotations.AllValuesAreNonnullByDefault
-package org.eclipse.ditto.concierge.service.common;
+package org.eclipse.ditto.base.api.commands.sudo;

base/api/src/main/java/org/eclipse/ditto/base/api/devops/signals/commands/ExecutePiggybackCommand.java

@@ -20,16 +20,16 @@
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonField;
-import org.eclipse.ditto.json.JsonFieldDefinition;
-import org.eclipse.ditto.json.JsonObject;
-import org.eclipse.ditto.json.JsonObjectBuilder;
 import org.eclipse.ditto.base.model.headers.DittoHeaders;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonParsableCommand;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.commands.CommandJsonDeserializer;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonField;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonObject;
+import org.eclipse.ditto.json.JsonObjectBuilder;
 
 /**
  * Command to execute an arbitrary wrapped Command which is included "piggyback" in this {@link DevOpsCommand}.
@@ -63,10 +63,14 @@ public final class ExecutePiggybackCommand extends AbstractDevOpsCommand<Execute
      */
     public static final String TYPE = TYPE_PREFIX + NAME;
 
-    public static final JsonFieldDefinition<String> JSON_TARGET_ACTORSELECTION =
+    private static final JsonFieldDefinition<String> JSON_TARGET_ACTORSELECTION =
             JsonFactory.newStringFieldDefinition("targetActorSelection", FieldType.REGULAR,
                     JsonSchemaVersion.V_2);
-    public static final JsonFieldDefinition<JsonObject> JSON_PIGGYBACK_COMMAND =
+
+    private static final JsonFieldDefinition<JsonObject> JSON_HEADERS =
+            JsonFactory.newJsonObjectFieldDefinition("headers", FieldType.REGULAR,
+                    JsonSchemaVersion.V_2);
+    private static final JsonFieldDefinition<JsonObject> JSON_PIGGYBACK_COMMAND =
             JsonFactory.newJsonObjectFieldDefinition("piggybackCommand", FieldType.REGULAR,
                     JsonSchemaVersion.V_2);
 
@@ -154,9 +158,13 @@ public static ExecutePiggybackCommand fromJson(final JsonObject jsonObject, fina
             final String serviceName = jsonObject.getValue(DevOpsCommand.JsonFields.JSON_SERVICE_NAME).orElse(null);
             final String instance = jsonObject.getValue(DevOpsCommand.JsonFields.JSON_INSTANCE).orElse(null);
             final String targetActorSelection = jsonObject.getValueOrThrow(JSON_TARGET_ACTORSELECTION);
+            final JsonObject dittoHeadersObj = jsonObject.getValueOrThrow(JSON_HEADERS);
+            final DittoHeaders combinedDittoHeaders = dittoHeaders.toBuilder()
+                    .putHeaders(DittoHeaders.newBuilder(dittoHeadersObj).build())
+                    .build();
             final JsonObject piggybackCommand = jsonObject.getValueOrThrow(JSON_PIGGYBACK_COMMAND);
 
-            return of(serviceName, instance, targetActorSelection, piggybackCommand, dittoHeaders);
+            return of(serviceName, instance, targetActorSelection, piggybackCommand, combinedDittoHeaders);
         });
     }
 
@@ -193,6 +201,7 @@ protected void appendPayload(final JsonObjectBuilder jsonObjectBuilder, final Js
 
         final Predicate<JsonField> predicate = schemaVersion.and(thePredicate);
         jsonObjectBuilder.set(JSON_TARGET_ACTORSELECTION, targetActorSelection, predicate);
+        jsonObjectBuilder.set(JSON_HEADERS, getDittoHeaders().toJson(), predicate);
         jsonObjectBuilder.set(JSON_PIGGYBACK_COMMAND, piggybackCommand, predicate);
     }
 

base/api/src/main/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupCommand.java

@@ -12,26 +12,27 @@
  */
 package org.eclipse.ditto.base.api.persistence.cleanup;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
-import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.base.api.commands.sudo.SudoCommand;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.Command;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonPointer;
 
 /**
  * Aggregates all {@link org.eclipse.ditto.base.model.signals.commands.Command}s which are related to cleaning up (e.g. journal entries) in the database.
  *
  * @param <T> the type of the implementing class.
  */
-public interface CleanupCommand<T extends CleanupCommand<T>> extends Command<T>, SignalWithEntityId<T> {
+public interface CleanupCommand<T extends CleanupCommand<T>> extends SudoCommand<T>, SignalWithEntityId<T> {
 
     /**
      * Type Prefix of Thing commands.
      */
-    String TYPE_PREFIX = "cleanup." + TYPE_QUALIFIER + ":";
+    String TYPE_PREFIX = "cleanup." + SUDO_TYPE_QUALIFIER;
 
     /**
      * Thing resource type.

base/api/src/main/java/org/eclipse/ditto/base/api/persistence/cleanup/CleanupCommandResponse.java

@@ -12,28 +12,28 @@
  */
 package org.eclipse.ditto.base.api.persistence.cleanup;
 
-import org.eclipse.ditto.json.JsonFactory;
-import org.eclipse.ditto.json.JsonFieldDefinition;
-import org.eclipse.ditto.json.JsonPointer;
+import org.eclipse.ditto.base.api.commands.sudo.SudoQueryCommandResponse;
 import org.eclipse.ditto.base.model.entity.id.EntityId;
 import org.eclipse.ditto.base.model.json.FieldType;
 import org.eclipse.ditto.base.model.json.JsonSchemaVersion;
 import org.eclipse.ditto.base.model.signals.SignalWithEntityId;
 import org.eclipse.ditto.base.model.signals.commands.Command;
-import org.eclipse.ditto.base.model.signals.commands.CommandResponse;
+import org.eclipse.ditto.json.JsonFactory;
+import org.eclipse.ditto.json.JsonFieldDefinition;
+import org.eclipse.ditto.json.JsonPointer;
 
 /**
  * Aggregates all possible responses relating to a given {@link CleanupCommand}.
  *
  * @param <T> the type of the implementing class.
  */
-public interface CleanupCommandResponse<T extends CleanupCommandResponse<T>> extends CommandResponse<T>,
+public interface CleanupCommandResponse<T extends CleanupCommandResponse<T>> extends SudoQueryCommandResponse<T>,
         SignalWithEntityId<T> {
 
     /**
      * Type Prefix of Cleanup command responses.
      */
-    String TYPE_PREFIX = "cleanup." + TYPE_QUALIFIER + ":";
+    String TYPE_PREFIX = "cleanup." + SUDO_TYPE_QUALIFIER;
 
     /**
      * Thing resource type.