Don't fail when attempting to create pre-existing tenant

2 files changed, 3 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java
index 79a55466021..e9b1c8c83f8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/v2/TenantHandler.java
@@ -6,6 +6,7 @@ import com.yahoo.component.annotation.Inject;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.container.jdisc.HttpResponse;
 import com.yahoo.restapi.ErrorResponse;
+import com.yahoo.restapi.MessageResponse;
 import com.yahoo.restapi.RestApi;
 import com.yahoo.restapi.RestApiException;
 import com.yahoo.restapi.RestApiRequestHandler;
@@ -63,7 +64,7 @@ public class TenantHandler extends RestApiRequestHandler<TenantHandler> {
     private HttpResponse putTenant(RestApi.RequestContext context) {
         TenantName name = TenantName.from(context.pathParameters().getStringOrThrow("tenant"));
         if (tenantRepository.checkThatTenantExists(name))
-            throw new RestApiException.BadRequest("There already exists a tenant '" + name + "'");
+            return new MessageResponse("Tenant '" + name + "' already exists");
         if ( ! name.value().matches(TENANT_NAME_REGEXP))
             throw new RestApiException.BadRequest("Illegal tenant name: " + name);
 
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
index 49e6ebbfcff..fbebd463569 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/TenantHandlerTest.java
@@ -108,7 +108,7 @@ public class TenantHandlerTest {
                        "{\"message\":\"Tenant a created.\"}");
         assertEquals(tenantRepository.getTenant(a).getName(), a);
         assertResponse(PUT, "/application/v2/tenant/a",
-                       "{\"error-code\":\"BAD_REQUEST\",\"message\":\"There already exists a tenant 'a'\"}");
+                       "{\"message\":\"Tenant 'a' already exists\"}");
     }
 
     @Test