Revert "Add identity type to unique instance id and signed identity document"

This reverts commit cfa6d7bb63402b83c84a16411a207e946de33246.

12 files changed, 28 insertions, 135 deletions

diff --git a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java
index 947c132167f..ffeca67645b 100644
--- a/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java
+++ b/athenz-identity-provider-service/src/main/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/identitydocument/IdentityDocumentGenerator.java
@@ -75,8 +75,7 @@ public class IdentityDocumentGenerator {
                     identityDocument.configServerHostname(),
                     identityDocument.instanceHostname(),
                     identityDocument.createdAt(),
-                    identityDocument.ipAddresses(),
-                    null); // TODO Specify identity type
+                    identityDocument.ipAddresses());
         } catch (Exception e) {
             throw new RuntimeException("Exception generating identity document: " + e.getMessage(), e);
         }
diff --git a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
index 54411b424eb..1ac9ff6f83a 100644
--- a/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
+++ b/athenz-identity-provider-service/src/test/java/com/yahoo/vespa/hosted/athenz/instanceproviderservice/instanceconfirmation/InstanceValidatorTest.java
@@ -147,8 +147,7 @@ public class InstanceValidatorTest {
                                                      identityDocument.configServerHostname,
                                                      identityDocument.instanceHostname,
                                                      identityDocument.createdAt,
-                                                     identityDocument.ipAddresses,
-                                                     null)); // TODO Remove support for legacy representation without type
+                                                     identityDocument.ipAddresses));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
index bd75368a0dc..f7e9c3ca1d8 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/identity/AthenzCredentialsMaintainer.java
@@ -148,7 +148,6 @@ public class AthenzCredentialsMaintainer {
         }
     }
 
-    @SuppressWarnings("deprecation")
     private VespaUniqueInstanceId getVespaUniqueInstanceId(NodeSpec nodeSpec) {
         NodeSpec.Membership membership = nodeSpec.getMembership().get();
         NodeSpec.Owner owner = nodeSpec.getOwner().get();
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java
index 11c7832091b..c0cead74f5f 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/filter/NodeIdentifierTest.java
@@ -29,7 +29,6 @@ import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.Optional;
 
-import static com.yahoo.vespa.athenz.identityprovider.api.IdentityType.*;
 import static com.yahoo.vespa.athenz.tls.KeyAlgorithm.RSA;
 import static com.yahoo.vespa.athenz.tls.SignatureAlgorithm.SHA256_WITH_RSA;
 import static java.util.Collections.emptySet;
@@ -162,7 +161,7 @@ public class NodeIdentifierTest {
         Pkcs10Csr csr = Pkcs10CsrBuilder
                 .fromKeypair(new X500Principal("CN=" + TENANT_NODE_IDENTITY), KEYPAIR, SHA256_WITH_RSA)
                 .build();
-        VespaUniqueInstanceId vespaUniqueInstanceId = new VespaUniqueInstanceId(clusterIndex, clusterId, INSTANCE_ID, application, tenant, region, environment, NODE);
+        VespaUniqueInstanceId vespaUniqueInstanceId = new VespaUniqueInstanceId(clusterIndex, clusterId, INSTANCE_ID, application, tenant, region, environment);
         X509Certificate certificate = X509CertificateBuilder
                 .fromCsr(csr, ATHENZ_YAHOO_CA_CERT.getSubjectX500Principal(), Instant.EPOCH, Instant.EPOCH.plusSeconds(60), KEYPAIR.getPrivate(), SHA256_WITH_RSA, 1)
                 .addSubjectAlternativeName(vespaUniqueInstanceId.asDottedString() + ".instanceid.athenz.provider-name.vespa.yahoo.cloud")
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java
index 12389712976..9f065e7285d 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/EntityBindingsMapper.java
@@ -12,8 +12,6 @@ import com.yahoo.vespa.athenz.utils.AthenzIdentities;
 
 import java.util.Base64;
 
-import static com.yahoo.vespa.athenz.identityprovider.api.VespaUniqueInstanceId.*;
-
 /**
  * Utility class for mapping objects model types and their Jackson binding versions.
  *
@@ -35,7 +33,7 @@ public class EntityBindingsMapper {
 
     public static VespaUniqueInstanceId toVespaUniqueInstanceId(VespaUniqueInstanceIdEntity entity) {
         return new VespaUniqueInstanceId(
-                entity.clusterIndex, entity.clusterId, entity.instance, entity.application, entity.tenant, entity.region, entity.environment, entity.type != null ? IdentityType.fromId(entity.type) : null); // TODO Remove support for legacy representation without type
+                entity.clusterIndex, entity.clusterId, entity.instance, entity.application, entity.tenant, entity.region, entity.environment);
     }
 
     public static IdentityDocument toIdentityDocument(IdentityDocumentEntity entity) {
@@ -52,7 +50,7 @@ public class EntityBindingsMapper {
                 toIdentityDocument(entity.identityDocument),
                 entity.signature,
                 entity.signingKeyVersion,
-                fromDottedString(entity.providerUniqueId),
+                VespaUniqueInstanceId.fromDottedString(entity.providerUniqueId),
                 entity.dnsSuffix,
                 (AthenzService) AthenzIdentities.from(entity.providerService),
                 entity.ztsEndpoint,
@@ -60,14 +58,13 @@ public class EntityBindingsMapper {
                 entity.configServerHostname,
                 entity.instanceHostname,
                 entity.createdAt,
-                entity.ipAddresses,
-                entity.identityType != null ? IdentityType.fromId(entity.identityType) : null); // TODO Remove support for legacy representation without type
+                entity.ipAddresses);
     }
 
     public static VespaUniqueInstanceIdEntity toVespaUniqueInstanceIdEntity(VespaUniqueInstanceId model) {
         return new VespaUniqueInstanceIdEntity(
                 model.tenant(), model.application(), model.environment(), model.region(),
-                model.instance(), model.clusterId(), model.clusterIndex(), model.type() != null ? model.type().id() : null); // TODO Remove support for legacy representation without type
+                model.instance(), model.clusterId(), model.clusterIndex());
     }
 
     public static IdentityDocumentEntity toIdentityDocumentEntity(IdentityDocument model) {
@@ -95,8 +92,7 @@ public class EntityBindingsMapper {
                     model.configServerHostname(),
                     model.instanceHostname(),
                     model.createdAt(),
-                    model.ipAddresses(),
-                    model.identityType() != null ? model.identityType().id() : null); // TODO Remove support for legacy representation without type
+                    model.ipAddresses());
         } catch (JsonProcessingException e) {
             throw new RuntimeException(e);
         }
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityType.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityType.java
deleted file mode 100644
index 4ca2e34a618..00000000000
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/IdentityType.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.athenz.identityprovider.api;
-
-import java.util.Arrays;
-
-/**
- * Represents the types of identities that the configserver can provide.
- *
- * @author bjorncs
- */
-public enum IdentityType {TENANT("tenant"), NODE("node");
-    private final String id;
-
-    IdentityType(String id) { this.id = id; }
-
-    public String id() { return id; }
-
-    public static IdentityType fromId(String id) {
-        return Arrays.stream(values())
-                .filter(v -> v.id.equals(id))
-                .findFirst()
-                .orElseThrow(() -> new IllegalArgumentException("Invalid id: " + id));
-    }
-}
-
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java
index 60be42544c7..6372c2202f0 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/SignedIdentityDocument.java
@@ -28,7 +28,6 @@ public class SignedIdentityDocument {
     private final String instanceHostname;
     private final Instant createdAt;
     private final Set<String> ipAddresses;
-    private final IdentityType identityType;
 
     public SignedIdentityDocument(IdentityDocument identityDocument,
                                   String signature,
@@ -41,8 +40,7 @@ public class SignedIdentityDocument {
                                   String configServerHostname,
                                   String instanceHostname,
                                   Instant createdAt,
-                                  Set<String> ipAddresses,
-                                  IdentityType identityType) {
+                                  Set<String> ipAddresses) {
         this.identityDocument = identityDocument;
         this.signature = signature;
         this.signingKeyVersion = signingKeyVersion;
@@ -55,7 +53,6 @@ public class SignedIdentityDocument {
         this.instanceHostname = instanceHostname;
         this.createdAt = createdAt;
         this.ipAddresses = ipAddresses;
-        this.identityType = identityType;
     }
 
     public IdentityDocument identityDocument() {
@@ -105,8 +102,4 @@ public class SignedIdentityDocument {
     public Set<String> ipAddresses() {
         return ipAddresses;
     }
-
-    public IdentityType identityType() {
-        return identityType;
-    }
 }
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceId.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceId.java
index be94cc59691..5539ba53882 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceId.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceId.java
@@ -4,8 +4,6 @@ package com.yahoo.vespa.athenz.identityprovider.api;
 import java.util.Objects;
 
 /**
- * Represents the unique instance id as used in Vespa's integration with Athenz Copper Argos
- *
  * @author bjorncs
  */
 public class VespaUniqueInstanceId {
@@ -17,7 +15,6 @@ public class VespaUniqueInstanceId {
     private final String tenant;
     private final String region;
     private final String environment;
-    private final IdentityType type;
 
     public VespaUniqueInstanceId(int clusterIndex,
                                  String clusterId,
@@ -25,8 +22,7 @@ public class VespaUniqueInstanceId {
                                  String application,
                                  String tenant,
                                  String region,
-                                 String environment,
-                                 IdentityType type) {
+                                 String environment) {
         this.clusterIndex = clusterIndex;
         this.clusterId = clusterId;
         this.instance = instance;
@@ -34,43 +30,21 @@ public class VespaUniqueInstanceId {
         this.tenant = tenant;
         this.region = region;
         this.environment = environment;
-        this.type = type;
     }
 
-    // TODO Remove support for legacy representation without type
-    @Deprecated
-    public VespaUniqueInstanceId(int clusterIndex,
-                                 String clusterId,
-                                 String instance,
-                                 String application,
-                                 String tenant,
-                                 String region,
-                                 String environment) {
-        this(clusterIndex, clusterId, instance, application, tenant, region, environment, null);
-    }
-
-
-    // TODO Remove support for legacy representation without type
     public static VespaUniqueInstanceId fromDottedString(String instanceId) {
         String[] tokens = instanceId.split("\\.");
-        if (tokens.length != 7 && tokens.length != 8) {
+        if (tokens.length != 7) {
             throw new IllegalArgumentException("Invalid instance id: " + instanceId);
         }
         return new VespaUniqueInstanceId(
-                Integer.parseInt(tokens[0]), tokens[1], tokens[2], tokens[3], tokens[4], tokens[5], tokens[6], tokens.length == 8 ? IdentityType.fromId(tokens[7]) : null);
+                Integer.parseInt(tokens[0]), tokens[1], tokens[2], tokens[3], tokens[4], tokens[5], tokens[6]);
     }
 
-    // TODO Remove support for legacy representation without type
     public String asDottedString() {
-        if (type != null) {
-            return String.format(
-                    "%d.%s.%s.%s.%s.%s.%s.%s",
-                    clusterIndex, clusterId, instance, application, tenant, region, environment, type.id());
-        } else {
-            return String.format(
-                    "%d.%s.%s.%s.%s.%s.%s",
-                    clusterIndex, clusterId, instance, application, tenant, region, environment);
-        }
+        return String.format(
+                "%d.%s.%s.%s.%s.%s.%s",
+                clusterIndex, clusterId, instance, application, tenant, region, environment);
     }
 
     public int clusterIndex() {
@@ -101,8 +75,6 @@ public class VespaUniqueInstanceId {
         return environment;
     }
 
-    public IdentityType type() { return type; }
-
     @Override
     public String toString() {
         return "VespaUniqueInstanceId{" +
@@ -113,7 +85,6 @@ public class VespaUniqueInstanceId {
                 ", tenant='" + tenant + '\'' +
                 ", region='" + region + '\'' +
                 ", environment='" + environment + '\'' +
-                ", type=" + type +
                 '}';
     }
 
@@ -128,12 +99,11 @@ public class VespaUniqueInstanceId {
                 Objects.equals(application, that.application) &&
                 Objects.equals(tenant, that.tenant) &&
                 Objects.equals(region, that.region) &&
-                Objects.equals(environment, that.environment) &&
-                type == that.type;
+                Objects.equals(environment, that.environment);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(clusterIndex, clusterId, instance, application, tenant, region, environment, type);
+        return Objects.hash(clusterIndex, clusterId, instance, application, tenant, region, environment);
     }
 }
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
index aa514b3caf3..5b8ea681b25 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/SignedIdentityDocumentEntity.java
@@ -37,7 +37,6 @@ public class SignedIdentityDocumentEntity {
     @JsonProperty("instance-hostname") public final String instanceHostname;
     @JsonProperty("created-at") public final Instant createdAt;
     @JsonProperty("ip-addresses") public final Set<String> ipAddresses;
-    @JsonProperty("identity-type") public final String identityType;
 
     @JsonCreator
     public SignedIdentityDocumentEntity(@JsonProperty("identity-document") String rawIdentityDocument,
@@ -51,8 +50,7 @@ public class SignedIdentityDocumentEntity {
                                         @JsonProperty("configserver-hostname") String configServerHostname,
                                         @JsonProperty("instance-hostname") String instanceHostname,
                                         @JsonProperty("created-at") Instant createdAt,
-                                        @JsonProperty("ip-addresses") Set<String> ipAddresses,
-                                        @JsonProperty("identity-type") String identityType) {
+                                        @JsonProperty("ip-addresses") Set<String> ipAddresses) {
         this.rawIdentityDocument = rawIdentityDocument;
         this.identityDocument = parseIdentityDocument(rawIdentityDocument);
         this.signature = signature;
@@ -66,7 +64,6 @@ public class SignedIdentityDocumentEntity {
         this.instanceHostname = instanceHostname;
         this.createdAt = createdAt;
         this.ipAddresses = ipAddresses;
-        this.identityType = identityType;
     }
 
     private static IdentityDocumentEntity parseIdentityDocument(String rawIdentityDocument) {
@@ -99,7 +96,6 @@ public class SignedIdentityDocumentEntity {
                 ", instanceHostname='" + instanceHostname + '\'' +
                 ", createdAt=" + createdAt +
                 ", ipAddresses=" + ipAddresses +
-                ", identityType=" + identityType +
                 '}';
     }
 
@@ -120,12 +116,14 @@ public class SignedIdentityDocumentEntity {
                 Objects.equals(configServerHostname, that.configServerHostname) &&
                 Objects.equals(instanceHostname, that.instanceHostname) &&
                 Objects.equals(createdAt, that.createdAt) &&
-                Objects.equals(ipAddresses, that.ipAddresses) &&
-                Objects.equals(identityType, identityType);
+                Objects.equals(ipAddresses, that.ipAddresses);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(rawIdentityDocument, identityDocument, signature, signingKeyVersion, providerUniqueId, dnsSuffix, providerService, ztsEndpoint, documentVersion, configServerHostname, instanceHostname, createdAt, ipAddresses, identityType);
+
+        return Objects.hash(rawIdentityDocument, identityDocument, signature, signingKeyVersion, providerUniqueId,
+                            dnsSuffix, providerService, ztsEndpoint, documentVersion, configServerHostname,
+                            instanceHostname, createdAt, ipAddresses);
     }
 }
diff --git a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/VespaUniqueInstanceIdEntity.java b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/VespaUniqueInstanceIdEntity.java
index 103c087638d..3127752ac7d 100644
--- a/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/VespaUniqueInstanceIdEntity.java
+++ b/vespa-athenz/src/main/java/com/yahoo/vespa/athenz/identityprovider/api/bindings/VespaUniqueInstanceIdEntity.java
@@ -1,7 +1,6 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.athenz.identityprovider.api.bindings;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 import java.util.Objects;
@@ -25,18 +24,14 @@ public class VespaUniqueInstanceIdEntity {
     public final String clusterId;
     @JsonProperty("cluster-index")
     public final int clusterIndex;
-    @JsonProperty("type")
-    public final String type;
 
-    @JsonCreator
     public VespaUniqueInstanceIdEntity(@JsonProperty("tenant") String tenant,
                                        @JsonProperty("application") String application,
                                        @JsonProperty("environment") String environment,
                                        @JsonProperty("region") String region,
                                        @JsonProperty("instance") String instance,
                                        @JsonProperty("cluster-id") String clusterId,
-                                       @JsonProperty("cluster-index") int clusterIndex,
-                                       @JsonProperty("type") String type) {
+                                       @JsonProperty("cluster-index") int clusterIndex) {
         this.tenant = tenant;
         this.application = application;
         this.environment = environment;
@@ -44,21 +39,8 @@ public class VespaUniqueInstanceIdEntity {
         this.instance = instance;
         this.clusterId = clusterId;
         this.clusterIndex = clusterIndex;
-        this.type = type;
     }
 
-    @Deprecated
-    public VespaUniqueInstanceIdEntity(String tenant,
-                                       String application,
-                                       String environment,
-                                       String region,
-                                       String instance,
-                                       String clusterId,
-                                       int clusterIndex) {
-        this(tenant, application, environment, region, instance, clusterId, clusterIndex, null);
-    }
-
-
     @Override
     public String toString() {
         return "VespaUniqueInstanceIdEntity{" +
@@ -69,7 +51,6 @@ public class VespaUniqueInstanceIdEntity {
                 ", instance='" + instance + '\'' +
                 ", clusterId='" + clusterId + '\'' +
                 ", clusterIndex=" + clusterIndex +
-                ", type='" + type + '\'' +
                 '}';
     }
 
@@ -84,12 +65,11 @@ public class VespaUniqueInstanceIdEntity {
                 Objects.equals(environment, that.environment) &&
                 Objects.equals(region, that.region) &&
                 Objects.equals(instance, that.instance) &&
-                Objects.equals(clusterId, that.clusterId) &&
-                Objects.equals(type, that.type);
+                Objects.equals(clusterId, that.clusterId);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(tenant, application, environment, region, instance, clusterId, clusterIndex, type);
+        return Objects.hash(tenant, application, environment, region, instance, clusterId, clusterIndex);
     }
 }
diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceIdTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceIdTest.java
index 86b6c566987..8c4e4c1262d 100644
--- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceIdTest.java
+++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/api/VespaUniqueInstanceIdTest.java
@@ -2,7 +2,6 @@ package com.yahoo.vespa.athenz.identityprovider.api;
 
 import org.junit.Test;
 
-import static com.yahoo.vespa.athenz.identityprovider.api.IdentityType.*;
 import static org.junit.Assert.*;
 
 /**
@@ -13,18 +12,6 @@ public class VespaUniqueInstanceIdTest {
     @Test
     public void can_serialize_to_and_deserialize_from_string() {
         VespaUniqueInstanceId id =
-                new VespaUniqueInstanceId(1, "cluster-id", "instance", "application", "tenant", "region", "environment", TENANT);
-        String stringRepresentation = id.asDottedString();
-        String expectedStringRepresentation = "1.cluster-id.instance.application.tenant.region.environment.tenant";
-        assertEquals(expectedStringRepresentation, stringRepresentation);
-        VespaUniqueInstanceId deserializedId = VespaUniqueInstanceId.fromDottedString(stringRepresentation);
-        assertEquals(id, deserializedId);
-    }
-
-    // TODO Remove support for legacy representation without type
-    @Test
-    public void supports_legacy_representation_without_type() {
-        VespaUniqueInstanceId id =
                 new VespaUniqueInstanceId(1, "cluster-id", "instance", "application", "tenant", "region", "environment");
         String stringRepresentation = id.asDottedString();
         String expectedStringRepresentation = "1.cluster-id.instance.application.tenant.region.environment";
diff --git a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java
index 7ad465a7d80..a84435f2982 100644
--- a/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java
+++ b/vespa-athenz/src/test/java/com/yahoo/vespa/athenz/identityprovider/client/AthenzIdentityProviderImplTest.java
@@ -11,7 +11,6 @@ import com.yahoo.test.ManualClock;
 import com.yahoo.vespa.athenz.api.AthenzService;
 import com.yahoo.vespa.athenz.identityprovider.api.EntityBindingsMapper;
 import com.yahoo.vespa.athenz.identityprovider.api.IdentityDocument;
-import com.yahoo.vespa.athenz.identityprovider.api.IdentityType;
 import com.yahoo.vespa.athenz.identityprovider.api.SignedIdentityDocument;
 import com.yahoo.vespa.athenz.identityprovider.api.VespaUniqueInstanceId;
 import com.yahoo.vespa.athenz.tls.KeyStoreBuilder;
@@ -133,7 +132,7 @@ public class AthenzIdentityProviderImplTest {
     }
 
     private static String getIdentityDocument() throws JsonProcessingException {
-        VespaUniqueInstanceId instanceId = new VespaUniqueInstanceId(0, "default", "default", "application", "tenant", "us-north-1", "dev", IdentityType.TENANT);
+        VespaUniqueInstanceId instanceId = new VespaUniqueInstanceId(0, "default", "default", "application", "tenant", "us-north-1", "dev");
         SignedIdentityDocument signedIdentityDocument = new SignedIdentityDocument(
                 new IdentityDocument(instanceId, "localhost", "x.y.com", Instant.EPOCH, Collections.emptySet()),
                 "dummysignature",
@@ -146,8 +145,7 @@ public class AthenzIdentityProviderImplTest {
                 "localhost",
                 "x.y.com",
                 Instant.EPOCH,
-                Collections.emptySet(),
-                IdentityType.TENANT);
+                Collections.emptySet());
 
         return new ObjectMapper().registerModule(new JavaTimeModule())
                 .writeValueAsString(EntityBindingsMapper.toSignedIdentityDocumentEntity(signedIdentityDocument));