@oneuptime/common 14.0.5 → 14.0.7

package/Types/Topology/TopologyApi.ts

@@ -0,0 +1,428 @@
+import { JSONObject } from "../JSON";
+
+/*
+ * Wire contract of the Topology API (POST /api/telemetry/topology/...).
+ *
+ * The Topology maps used to download the whole inventory — every item and
+ * every relationship — and build the maps in the browser, which stopped at
+ * 10,000 rows of each. These endpoints do the graph work in Postgres instead
+ * and return only what each view draws, so counts, search and connections
+ * cover the whole inventory however large it is.
+ *
+ * This is an internal contract between the server and the Dashboard bundle
+ * that shipped with it, not a public API. `formatVersion` changes whenever a
+ * response shape does, so an old bundle talking to a new server can tell the
+ * user to reload instead of misreading the payload.
+ *
+ * Every request carries `rangeStart` (ISO 8601). The server floors it to the
+ * minute, uses it for every "reported in range" decision, and echoes the value
+ * it used; the client must compute activity against the echoed value so both
+ * sides agree about which resources are active. Timestamps in responses are
+ * epoch milliseconds.
+ */
+
+export const TOPOLOGY_API_FORMAT_VERSION: number = 1;
+
+export enum TopologyApiPath {
+  ServiceMap = "/telemetry/topology/service-map",
+  Infrastructure = "/telemetry/topology/infrastructure",
+  InfrastructureCollection = "/telemetry/topology/infrastructure/collection",
+  InfrastructureCollectionSearch = "/telemetry/topology/infrastructure/collection-search",
+  Entity = "/telemetry/topology/entity",
+  EntityConnections = "/telemetry/topology/entity/connections",
+  /*
+   * The same sections over everything the inventory holds rather than over a
+   * range (see TopologyEntityAllTimeRequestJSON): the inventory item page's
+   * Connections card, which has no time range.
+   */
+  EntityAllTime = "/telemetry/topology/entity/all-time",
+  EntityAllTimeConnections = "/telemetry/topology/entity/all-time/connections",
+}
+
+export const TopologyApiLimits: {
+  /*
+   * Safety valves. Discovery budgets keep real projects far below these; they
+   * exist so a future budget override cannot turn one request into gigabytes.
+   * Hitting one is reported (never silent) with exact totals.
+   */
+  MaxServiceMapEntities: number;
+  MaxServiceMapDependencies: number;
+  MaxInfrastructureNodes: number;
+  /*
+   * A flat infrastructure type (see isFlatInfrastructureType) with more
+   * non-archived items than this is returned as a collection — exact counts,
+   * rows paged from the server on demand — instead of row by row.
+   */
+  InlineFlatItemsPerType: number;
+  CollectionPageSizeDefault: number;
+  CollectionPageSizeMax: number;
+  MaxSearchTerms: number;
+  MaxSearchTermLength: number;
+  MaxCollectionSearchTypes: number;
+  /* Rows returned per drawer section before "Show more". */
+  EntityDependencyRows: number;
+  EntityOtherRows: number;
+  EntityConnectionsPageSizeMax: number;
+  /*
+   * Most relationships the drawer reads for one entity. A cluster that has
+   * seen hundreds of thousands of short-lived pods in the range stops here and
+   * reports its totals as lower bounds ("100,000+") instead of timing out.
+   */
+  EntityConnectionScanLimit: number;
+  /*
+   * Oldest range start the two maps honour, in days before now; an older one
+   * is clamped to it and the clamped value is echoed. Well past the longest
+   * relative range the time picker offers (3 months) and past every retention
+   * that matters (relationships are pruned after 30 days), and it bounds how
+   * many distinct minutes — each a separate whole-inventory build and cache
+   * entry — a caller can ask for.
+   */
+  MaxMapRangeStartAgeDays: number;
+} = {
+  MaxServiceMapEntities: 50_000,
+  MaxServiceMapDependencies: 200_000,
+  MaxInfrastructureNodes: 200_000,
+  InlineFlatItemsPerType: 1_000,
+  CollectionPageSizeDefault: 50,
+  CollectionPageSizeMax: 200,
+  MaxSearchTerms: 10,
+  MaxSearchTermLength: 100,
+  MaxCollectionSearchTypes: 100,
+  EntityDependencyRows: 100,
+  EntityOtherRows: 25,
+  EntityConnectionsPageSizeMax: 200,
+  EntityConnectionScanLimit: 100_000,
+  MaxMapRangeStartAgeDays: 400,
+};
+
+// ---------------------------------------------------------------- requests
+
+export interface TopologyRangeRequestJSON {
+  /** ISO 8601; floored to the minute by the server. */
+  rangeStart: string;
+}
+
+/** The Service Map and Infrastructure maps. */
+export interface TopologyMapRequestJSON extends TopologyRangeRequestJSON {
+  /*
+   * An explicit refresh by the user ("Refresh topology"). The maps are served
+   * from a short-lived per-process cache (up to a minute old); a fresh
+   * request skips that cached copy and rebuilds — still sharing a build of
+   * the same map that is already running — and the new result replaces the
+   * cached one. Omit (or false) for every other load.
+   */
+  fresh?: boolean | undefined;
+}
+
+export type TopologyServiceMapRequestJSON = TopologyMapRequestJSON;
+
+export type TopologyInfrastructureRequestJSON = TopologyMapRequestJSON;
+
+export interface TopologyCollectionCursorJSON {
+  /** Display name of the last row of the previous page ("" when it had none). */
+  name: string;
+  key: string;
+}
+
+/** One page of a collection, ordered by display name then entity key. */
+export interface TopologyCollectionRequestJSON
+  extends TopologyRangeRequestJSON {
+  entityType: string;
+  includeInactive: boolean;
+  /*
+   * Case-insensitive substrings that must ALL appear in the display name.
+   * Search terms the client already matched against the type's label are
+   * left out, mirroring how the in-browser search matches name OR type label.
+   */
+  nameTerms?: Array<string> | undefined;
+  cursor?: TopologyCollectionCursorJSON | null | undefined;
+  limit?: number | undefined;
+}
+
+/** How many items of each collection match a search. */
+export interface TopologyCollectionSearchRequestJSON
+  extends TopologyRangeRequestJSON {
+  includeInactive: boolean;
+  types: Array<{ entityType: string; nameTerms: Array<string> }>;
+}
+
+/* Which entity a drawer or inventory read is about. */
+export interface TopologyEntityTargetJSON {
+  entityKey: string;
+  /* Narrows the lookup when the caller knows it; the key alone is enough. */
+  entityType?: string | null | undefined;
+}
+
+export interface TopologyEntityRequestJSON
+  extends TopologyRangeRequestJSON,
+    TopologyEntityTargetJSON {}
+
+export type TopologyConnectionSection =
+  | "calls"
+  | "calledBy"
+  | "runsOn"
+  | "related";
+
+export const TOPOLOGY_CONNECTION_SECTIONS: ReadonlyArray<TopologyConnectionSection> =
+  ["calls", "calledBy", "runsOn", "related"];
+
+/** Where one page of one section starts, and how many rows it holds. */
+export interface TopologyConnectionsPageRequestJSON {
+  section: TopologyConnectionSection;
+  offset: number;
+  limit?: number | undefined;
+}
+
+/** "Show more" for one drawer section. */
+export interface TopologyEntityConnectionsRequestJSON
+  extends TopologyEntityRequestJSON,
+    TopologyConnectionsPageRequestJSON {}
+
+/*
+ * The all-time variant, for the inventory item page. It has no range start:
+ * every relationship the inventory holds counts however long ago it was last
+ * seen (edges drawn by hand are never re-bumped and never pruned, so a range
+ * would hide them), and archived items count as items — both the entity
+ * asked about, which the inventory page still shows, and the other ends.
+ */
+export type TopologyEntityAllTimeRequestJSON = TopologyEntityTargetJSON;
+
+export interface TopologyEntityAllTimeConnectionsRequestJSON
+  extends TopologyEntityTargetJSON,
+    TopologyConnectionsPageRequestJSON {}
+
+// --------------------------------------------------------------- responses
+
+export interface TopologyResponseEnvelopeJSON {
+  formatVersion: number;
+  /** The range start the server used (ISO 8601, floored to the minute). */
+  rangeStart: string;
+  /** ISO 8601. */
+  generatedAt: string;
+}
+
+export interface TopologyTruncationJSON {
+  shown: number;
+  total: number;
+}
+
+/** The lean inventory item every map row is built from. */
+export interface TopologyEntityJSON {
+  key: string;
+  type: string;
+  name: string | null;
+  source: string;
+  /** Epoch ms. */
+  lastSeenAt: number | null;
+}
+
+export interface TopologyServiceMapEntityJSON extends TopologyEntityJSON {
+  /*
+   * Only SERVICE_MAP_DETAIL_ATTRIBUTE_KEYS whose value is a string, per bag.
+   * The bags stay separate because the reader prefers descriptive values.
+   */
+  descriptiveAttributes?: Record<string, string> | undefined;
+  identifyingAttributes?: Record<string, string> | undefined;
+}
+
+/** An in-range `depends-on` relationship whose caller is a service. */
+export interface TopologyDependencyJSON {
+  from: string;
+  to: string;
+  callCount: number | null;
+  errorCount: number | null;
+  avgDurationMs: number | null;
+}
+
+/** Distinct resources of one type a service runs on (runs-on / hosted-on). */
+export interface TopologyRunsOnCountJSON {
+  service: string;
+  type: string;
+  /** Targets that reported in range. */
+  active: number;
+  /** All non-archived targets. */
+  total: number;
+}
+
+export interface TopologyServiceMapResponseJSON
+  extends TopologyResponseEnvelopeJSON {
+  /*
+   * Every non-archived service (active or not, so inactive services can be
+   * counted), plus every non-archived item a service calls.
+   */
+  entities: Array<TopologyServiceMapEntityJSON>;
+  /* In the order the old list API returned them: createdAt DESC, _id ASC. */
+  dependencies: Array<TopologyDependencyJSON>;
+  runsOn: Array<TopologyRunsOnCountJSON>;
+  entityTruncation: TopologyTruncationJSON | null;
+  dependencyTruncation: TopologyTruncationJSON | null;
+}
+
+/*
+ * One infrastructure resource and where it nests. The server chooses each
+ * resource's container in SQL with the Dashboard's own nesting rules, so the
+ * browser never needs the relationships themselves.
+ */
+export interface TopologyInfrastructureNodeJSON extends TopologyEntityJSON {
+  /*
+   * Index into `nodes` of the best container among ALL nodes, and the type
+   * of the relationship that won. Absent when nothing contains it.
+   */
+  parent?: number | undefined;
+  parentVia?: string | undefined;
+  /*
+   * The best container among ACTIVE nodes, sent only when it differs from
+   * `parent` (i.e. `parent` did not report in range). -1 means no active node
+   * contains it. With inactive resources hidden the browser falls back to it.
+   */
+  activeParent?: number | undefined;
+  activeParentVia?: string | undefined;
+}
+
+export interface TopologyInfrastructureServiceJSON {
+  key: string;
+  name: string | null;
+}
+
+/** A flat infrastructure type too large to ship row by row. */
+export interface TopologyInfrastructureCollectionJSON {
+  type: string;
+  /** Non-archived items of this type. */
+  total: number;
+  /** Of those, the ones that reported in range. */
+  active: number;
+  /** Epoch ms: latest lastSeenAt over all items, and over active ones. */
+  lastSeenAt: number | null;
+  activeLastSeenAt: number | null;
+}
+
+/*
+ * An in-range `depends-on` relationship between two placed services (see
+ * `placements`), by index into `services`. The map draws it as traffic
+ * between the resources those services run on.
+ */
+export interface TopologyInfrastructureDependencyJSON {
+  from: number;
+  to: number;
+  callCount: number | null;
+  errorCount: number | null;
+  avgDurationMs: number | null;
+}
+
+export interface TopologyInfrastructureResponseJSON
+  extends TopologyResponseEnvelopeJSON {
+  /* Ordered by (type, key). */
+  nodes: Array<TopologyInfrastructureNodeJSON>;
+  /* Every non-archived service, so placements and labels resolve. */
+  services: Array<TopologyInfrastructureServiceJSON>;
+  /* Distinct [index into services, index into nodes] from in-range runs-on / hosted-on. */
+  placements: Array<[number, number]>;
+  /*
+   * In-range calls between services that both run on a shipped node,
+   * ordered by (from, to). The browser reads a payload without them as "no
+   * traffic known", so the field needs no format version of its own.
+   */
+  dependencies: Array<TopologyInfrastructureDependencyJSON>;
+  /* The dependency cap (MaxServiceMapDependencies), when it was hit. */
+  dependencyTruncation: TopologyTruncationJSON | null;
+  collections: Array<TopologyInfrastructureCollectionJSON>;
+  /* Every non-archived infrastructure item, collections included. */
+  totals: { resources: number; activeResources: number };
+  truncation: TopologyTruncationJSON | null;
+}
+
+export interface TopologyCollectionResponseJSON
+  extends TopologyResponseEnvelopeJSON {
+  entityType: string;
+  /** Items matching the request's filters, across all pages. */
+  total: number;
+  items: Array<TopologyEntityJSON>;
+  nextCursor: TopologyCollectionCursorJSON | null;
+}
+
+export interface TopologyCollectionSearchResponseJSON
+  extends TopologyResponseEnvelopeJSON {
+  /* Only types with at least one match. */
+  matches: Array<{ entityType: string; count: number }>;
+}
+
+export interface TopologyEntityDetailJSON extends TopologyEntityJSON {
+  /** InventoryItem _id. */
+  id: string;
+  firstSeenAt: number | null;
+  resourceType: string | null;
+  resourceId: string | null;
+  identifyingAttributes: JSONObject | null;
+  descriptiveAttributes: JSONObject | null;
+}
+
+export interface TopologyConnectionRowJSON {
+  relationshipType: string;
+  /* "out" when the entity is the relationship's `from` (self-loops too). */
+  direction: "out" | "in";
+  otherKey: string;
+  /*
+   * false when the other end is not a non-archived item ("Undiscovered
+   * resource"); for the all-time endpoints, when it is not an item at all.
+   */
+  otherKnown: boolean;
+  /*
+   * InventoryItem _id of the other end, so the inventory page can link to it.
+   * Sent by the all-time endpoints only; null when otherKnown is false.
+   */
+  otherId?: string | null | undefined;
+  otherName: string | null;
+  otherType: string | null;
+  callCount: number | null;
+  errorCount: number | null;
+  avgDurationMs: number | null;
+  lastSeenAt: number | null;
+}
+
+export interface TopologyConnectionSectionJSON {
+  /* Exact unless the response says it is scan limited. */
+  total: number;
+  /* How many of `total` point at something no longer in inventory. */
+  unknownTotal: number;
+  rows: Array<TopologyConnectionRowJSON>;
+  /* Offset for the next page, or null when `rows` reached the end. */
+  nextOffset: number | null;
+}
+
+/*
+ * Sections classify an entity's in-range relationships the way the drawer
+ * always has: depends-on out = calls, depends-on in = calledBy, outbound
+ * runs-on / hosted-on from a service = runsOn, everything else = related.
+ * calls / calledBy are ordered by callCount desc, then label; runsOn /
+ * related put known resources first, then order by label.
+ */
+export interface TopologyEntityResponseJSON
+  extends TopologyResponseEnvelopeJSON {
+  /* null when no non-archived item has this key (sections are then empty). */
+  entity: TopologyEntityDetailJSON | null;
+  sections: Record<TopologyConnectionSection, TopologyConnectionSectionJSON>;
+  /* The scan stopped at EntityConnectionScanLimit: totals are lower bounds. */
+  isScanLimited: boolean;
+}
+
+export interface TopologyEntityConnectionsResponseJSON
+  extends TopologyResponseEnvelopeJSON {
+  section: TopologyConnectionSection;
+  connections: TopologyConnectionSectionJSON;
+  isScanLimited: boolean;
+}
+
+/*
+ * The all-time responses (TopologyEntityAllTimeRequestJSON) are shaped like
+ * the drawer's, without a range start to echo: `entity` is found among
+ * archived items too, and every row carries `otherId`.
+ */
+export type TopologyEntityAllTimeResponseJSON = Omit<
+  TopologyEntityResponseJSON,
+  "rangeStart"
+>;
+
+export type TopologyEntityAllTimeConnectionsResponseJSON = Omit<
+  TopologyEntityConnectionsResponseJSON,
+  "rangeStart"
+>;

package/Types/Topology/TopologyTypeRules.ts

@@ -0,0 +1,191 @@
+import EntityRelationshipType from "../Telemetry/EntityRelationshipType";
+import EntityType from "../Telemetry/EntityType";
+
+/*
+ * The rules that shape the Topology maps, shared by the server (which reduces
+ * the inventory graph in SQL) and the Dashboard (which builds the maps from
+ * the reduced data). Keeping them in one place is what lets the server hand
+ * the browser a few rows per resource instead of every relationship and still
+ * produce exactly the tree the Dashboard would have built from all of them.
+ */
+
+/*
+ * Types the Service Map owns. They describe software and its dependencies,
+ * not where anything runs, so they never become Infrastructure rows.
+ */
+export const TOPOLOGY_APPLICATION_TYPES: ReadonlySet<string> = new Set<string>([
+  EntityType.Service,
+  EntityType.ServiceInstance,
+  EntityType.TelemetrySdk,
+  EntityType.Database,
+  EntityType.RemoteService,
+  EntityType.Process,
+]);
+
+/** Types that may nest inside a structural container. */
+export const NESTABLE_CHILD_TYPES: Set<EntityType> = new Set<EntityType>([
+  EntityType.Container,
+  EntityType.Process,
+  EntityType.KubernetesPod,
+  EntityType.KubernetesNode,
+  EntityType.KubernetesNamespace,
+  EntityType.KubernetesDeployment,
+  EntityType.ProxmoxNode,
+  EntityType.ProxmoxGuest,
+  EntityType.VMwareCluster,
+  EntityType.VMwareHost,
+  EntityType.VMwareVirtualMachine,
+  EntityType.VMwareDatastore,
+  EntityType.DockerSwarmNode,
+  EntityType.DockerSwarmService,
+  EntityType.DockerSwarmTask,
+]);
+
+/*
+ * Valid structural containers, higher = more specific. Doubles as the
+ * allow-list of parent types: a candidate whose parent type is absent here
+ * (e.g. a Service) is rejected before priority is compared.
+ */
+export const CONTAINER_SPECIFICITY: Partial<Record<EntityType, number>> = {
+  [EntityType.KubernetesCluster]: 0,
+  [EntityType.ProxmoxCluster]: 0,
+  /*
+   * vSphere nests vCenter ⊃ cluster ⊃ ESXi host ⊃ VM; datastores sit
+   * directly under the vCenter. The cluster is optional (standalone hosts
+   * hang straight off the vCenter), so the host is more specific than the
+   * cluster but both may parent directly to the vCenter.
+   */
+  [EntityType.VMwareVCenter]: 0,
+  [EntityType.VMwareCluster]: 1,
+  [EntityType.CephCluster]: 0,
+  [EntityType.DockerSwarmCluster]: 0,
+  [EntityType.Host]: 1,
+  [EntityType.KubernetesNamespace]: 1,
+  [EntityType.KubernetesNode]: 2,
+  [EntityType.KubernetesDeployment]: 2,
+  [EntityType.ProxmoxNode]: 2,
+  [EntityType.VMwareHost]: 2,
+  [EntityType.DockerSwarmNode]: 2,
+  [EntityType.KubernetesPod]: 3,
+  [EntityType.ProxmoxGuest]: 3,
+  [EntityType.VMwareVirtualMachine]: 3,
+  [EntityType.DockerSwarmTask]: 3,
+  [EntityType.Container]: 4,
+};
+
+/* Which relationship expresses containment best: part-of > runs-on > member-of. */
+export const NESTING_RELATIONSHIP_PRIORITY: Partial<
+  Record<EntityRelationshipType, number>
+> = {
+  [EntityRelationshipType.PartOf]: 3,
+  [EntityRelationshipType.RunsOn]: 2,
+  [EntityRelationshipType.MemberOf]: 1,
+};
+
+/* Replicas worth collapsing: leaf resources that come in fleets. */
+export const REPLICA_GROUPABLE_TYPES: ReadonlySet<string> = new Set<string>([
+  EntityType.Host,
+  EntityType.KubernetesPod,
+  EntityType.Container,
+  EntityType.DockerSwarmTask,
+  EntityType.ProxmoxGuest,
+  EntityType.VMwareVirtualMachine,
+]);
+
+/* service → where it runs (service→host is hosted-on, service→pod runs-on). */
+export const PLACEMENT_RELATIONSHIP_TYPES: ReadonlySet<string> =
+  new Set<string>([
+    EntityRelationshipType.RunsOn,
+    EntityRelationshipType.HostedOn,
+  ]);
+
+/*
+ * The attributes the Service Map reads to label a node ("Node.js",
+ * "PostgreSQL"), in the order it tries them. The server ships only these, so
+ * the list lives here rather than beside the reader.
+ */
+export const SERVICE_MAP_DETAIL_ATTRIBUTE_KEYS: ReadonlyArray<string> = [
+  "telemetry.sdk.language",
+  "db.system.name",
+  "network.protocol.name",
+  "messaging.system",
+];
+
+/*
+ * Orders two keys by Unicode code point, which is the order Postgres gives
+ * `COLLATE "C"` on a UTF-8 database (UTF-8 bytes sort like code points). The
+ * server breaks ranking ties that way, so wherever the Dashboard must pick
+ * the same winner it compares with this rather than with `<`.
+ *
+ * JavaScript's `<` compares UTF-16 code units. The two orders agree
+ * everywhere except where a character beyond U+FFFF (stored as a surrogate
+ * pair, U+D800-U+DFFF) meets one in U+E000-U+FFFF: as code units the
+ * surrogate is smaller, as code points it is larger. Keys made only of
+ * characters up to U+FFFF therefore compare exactly as `<` compares them.
+ */
+export function compareCodePoints(a: string, b: string): number {
+  if (a === b) {
+    return 0;
+  }
+  const length: number = Math.min(a.length, b.length);
+  for (let index: number = 0; index < length; index++) {
+    const left: number = a.charCodeAt(index);
+    const right: number = b.charCodeAt(index);
+    if (left === right) {
+      continue;
+    }
+    if (left >= 0xd800 && right >= 0xd800) {
+      const leftIsSurrogate: boolean = left <= 0xdfff;
+      const rightIsSurrogate: boolean = right <= 0xdfff;
+      if (leftIsSurrogate !== rightIsSurrogate) {
+        /* The half of a character beyond U+FFFF outranks U+E000-U+FFFF. */
+        return leftIsSurrogate ? 1 : -1;
+      }
+    }
+    return left < right ? -1 : 1;
+  }
+  /* One is a prefix of the other: the shorter sorts first. */
+  return a.length < b.length ? -1 : 1;
+}
+
+export function isTopologyInfrastructureType(
+  entityType: string | undefined | null,
+): boolean {
+  return (
+    Boolean(entityType) &&
+    entityType !== EntityType.Service &&
+    !TOPOLOGY_APPLICATION_TYPES.has(entityType!)
+  );
+}
+
+/*
+ * Structural infrastructure types can take part in the tree: they nest, hold
+ * other resources, or are grouped with their replicas. Everything else that is
+ * infrastructure (network devices, IoT devices, cloud resources, manually
+ * registered appliances, types this version does not know) is flat: it never
+ * has a parent, never contains anything, and nothing groups it. Flat types are
+ * also the ones whose volume is not bounded by the discovery budgets, so the
+ * server summarizes a large flat type instead of shipping every row.
+ */
+export function isStructuralInfrastructureType(
+  entityType: string | undefined | null,
+): boolean {
+  if (!isTopologyInfrastructureType(entityType)) {
+    return false;
+  }
+  const type: EntityType = entityType as EntityType;
+  return (
+    NESTABLE_CHILD_TYPES.has(type) ||
+    CONTAINER_SPECIFICITY[type] !== undefined ||
+    REPLICA_GROUPABLE_TYPES.has(type)
+  );
+}
+
+export function isFlatInfrastructureType(
+  entityType: string | undefined | null,
+): boolean {
+  return (
+    isTopologyInfrastructureType(entityType) &&
+    !isStructuralInfrastructureType(entityType)
+  );
+}

package/UI/Components/Input/Input.tsx

@@ -30,6 +30,14 @@ export interface ComponentProps {
   ariaHasPopup?: "dialog" | "listbox" | "menu" | "grid" | "tree" | undefined;
   ariaExpanded?: boolean | undefined;
   ariaControls?: string | undefined;
+  /*
+   * A text box that drives a list of suggestions is a combobox; the option
+   * the arrow keys are on is named by ariaActiveDescendant, since focus
+   * itself never leaves the input.
+   */
+  role?: "combobox" | undefined;
+  ariaAutoComplete?: "list" | "both" | "inline" | "none" | undefined;
+  ariaActiveDescendant?: string | undefined;
   // For inputs with no visible label element to point ariaLabelledby at.
   ariaLabel?: string | undefined;
   /*
@@ -219,6 +227,9 @@ const Input: FunctionComponent<ComponentProps> = (
           aria-haspopup={props.ariaHasPopup}
           aria-expanded={props.ariaExpanded}
           aria-controls={props.ariaControls}
+          role={props.role}
+          aria-autocomplete={props.ariaAutoComplete}
+          aria-activedescendant={props.ariaActiveDescendant}
           aria-invalid={props.error || props.ariaInvalid ? "true" : undefined}
           aria-describedby={
             props.error ? "input-error-message" : props.ariaDescribedby