Revert "STORIF-330: refactored handling of Quotas. Introduced a service definition that allows to quickly introduce new services. Added service selector."

This reverts commit da0a602.

Author: skulpok-akamai

packages/api-v4/src/quotas/quotas.ts

@@ -1,48 +1,42 @@
 import { BETA_API_ROOT } from '../constants';
 import Request, { setMethod, setParams, setURL, setXFilter } from '../request';
 
-import type { Quota, QuotaServiceType, QuotaUsage } from './types';
+import type { Quota, QuotaType, QuotaUsage } from './types';
 import type { Filter, ResourcePage as Page, Params } from 'src/types';
 
 /**
  * getQuota
  *
  * Returns the details for a single quota within a particular service specified by `type`.
  *
- * @param quotaService { QuotaServiceType } retrieve a quota within this service type.
+ * @param type { QuotaType } retrieve a quota within this service type.
  * @param id { number } the quota ID to look up.
- * @param apiCollection { string } quota collection name (quotas/global-quotas).
+ * @param collection { string } quota collection name (quotas/global-quotas).
  */
-export const getQuota = (
-  quotaService: QuotaServiceType,
-  apiCollection: string,
-  id: number,
-) =>
+export const getQuota = (type: QuotaType, collection: string, id: number) =>
   Request<Quota>(
-    setURL(`${BETA_API_ROOT}/${quotaService}/${apiCollection}/${id}`),
+    setURL(`${BETA_API_ROOT}/${type}/${collection}/${id}`),
     setMethod('GET'),
   );
 
 /**
  * getQuotas
  *
- * Returns a paginated list of quotas for a particular service specified by `quotaService`.
+ * Returns a paginated list of quotas for a particular service specified by `type`.
  *
  * This request can be filtered on `quota_name`, `service_name` and `scope`.
  *
- * @param quotaService { QuotaServiceType } retrieve quotas within this service quotaService.
- * @param apiCollection { string } quota API collection name (e.g. quotas, global-quotas, etc.).
- * @param params { Params } query params to include in the request.
- * @param filter { Filter } filters to include in the request.
+ * @param type { QuotaType } retrieve quotas within this service type.
+ * @param collection { string } quota collection name (quotas/global-quotas).
  */
 export const getQuotas = (
-  quotaService: QuotaServiceType,
-  apiCollection: string,
+  type: QuotaType,
+  collection: string,
   params: Params = {},
   filter: Filter = {},
 ) =>
   Request<Page<Quota>>(
-    setURL(`${BETA_API_ROOT}/${quotaService}/${apiCollection}`),
+    setURL(`${BETA_API_ROOT}/${type}/${collection}`),
     setMethod('GET'),
     setXFilter(filter),
     setParams(params),
@@ -53,16 +47,16 @@ export const getQuotas = (
  *
  * Returns the usage for a single quota within a particular service specified by `type`.
  *
- * @param quotaService { QuotaServiceType } retrieve a quota within this service type.
- * @param apiCollection { string } quota collection name (quotas/global-quotas).
+ * @param type { QuotaType } retrieve a quota within this service type.
+ * @param collection { string } quota collection name (quotas/global-quotas).
  * @param id { string } the quota ID to look up.
  */
 export const getQuotaUsage = (
-  quotaService: QuotaServiceType,
-  apiCollection: string,
+  type: QuotaType,
+  collection: string,
   id: string,
 ) =>
   Request<QuotaUsage>(
-    setURL(`${BETA_API_ROOT}/${quotaService}/${apiCollection}/${id}/usage`),
+    setURL(`${BETA_API_ROOT}/${type}/${collection}/${id}/usage`),
     setMethod('GET'),
   );

packages/api-v4/src/quotas/types.ts

@@ -1,22 +1,40 @@
 import type { ObjectStorageEndpointTypes } from 'src/object-storage';
 import type { Region } from 'src/regions';
 
-export type LinodeQuotaResourceMetric = 'CPU' | 'GPU' | 'VPU';
-export type LkeQuotaResourceMetric = 'cluster';
-export type ObjectStorageEndpointQuotaResourceMetric =
-  | 'bucket'
-  | 'byte'
-  | 'byte_per_second'
-  | 'object'
-  | 'request';
-export type ObjectStorageGlobalQuotaResourceMetric = 'key';
+export enum QuotaResourceMetrics {
+  BUCKET = 'bucket',
+  BYTE = 'byte',
+  BYTE_PER_SECOND = 'byte_per_second',
+  CLUSTER = 'cluster',
+  CPU = 'CPU',
+  GPU = 'GPU',
+  OBJECT = 'object',
+  REQUEST = 'request',
+  VPU = 'VPU',
+}
 
-interface QuotaCommon<T> {
+/**
+ * A Quota is a service used limit that is rated based on service metrics such
+ * as vCPUs used, instances or storage size.
+ */
+export interface Quota {
   /**
    * Longer explanatory description for the quota.
    */
   description: string;
 
+  /**
+   * The OBJ endpoint type to which this limit applies.
+   *
+   * For OBJ limits only.
+   */
+  endpoint_type?: ObjectStorageEndpointTypes;
+
+  /**
+   * Sets usage column to be n/a when value is false.
+   */
+  has_usage?: boolean;
+
   /**
    * A unique identifier for the quota.
    */
@@ -34,80 +52,31 @@ interface QuotaCommon<T> {
   quota_name: string;
 
   /**
-   * The unit of measurement for this service limit.
+   * Customer facing id describing the quota.
    */
-  resource_metric: T;
-}
+  quota_type: string;
 
-interface QuotaCommonWithRegionApplied<T> extends QuotaCommon<T> {
   /**
    * The region slug to which this limit applies.
    *
    * OBJ limits are applied by endpoint, not region.
    * This below really just is a `string` type but being verbose helps with reading comprehension.
    */
-  region_applied: 'global' | Region['id'];
-}
-
-interface QuotaCommonWithUsage<T> extends QuotaCommon<T> {
-  /**
-   * Determines whether usage information is provided for this quota.
-   */
-  has_usage: boolean;
-}
-
-export type LinodeQuota =
-  QuotaCommonWithRegionApplied<LinodeQuotaResourceMetric>;
-
-export type LkeQuota = QuotaCommonWithRegionApplied<LkeQuotaResourceMetric>;
-
-export interface ObjectStorageGlobalQuota
-  extends QuotaCommon<ObjectStorageGlobalQuotaResourceMetric> {
-  /**
-   * Represents the quota type.
-   */
-  quota_type: 'keys';
-}
-
-export interface ObjectStorageEndpointQuota
-  extends QuotaCommonWithUsage<ObjectStorageEndpointQuotaResourceMetric> {
-  /**
-   * The OBJ endpoint type to which this limit applies.
-   *
-   */
-  endpoint_type: ObjectStorageEndpointTypes;
+  region_applied?: 'global' | Region['id'];
 
   /**
-   * Represents the quota type.
+   * The unit of measurement for this service limit.
    */
-  quota_type:
-    | 'obj-buckets'
-    | 'obj-bytes'
-    | 'obj-objects'
-    | 'obj-per-ip-concurrent-requests'
-    | 'obj-per-ip-egress-throughput'
-    | 'obj-per-ip-ingress-throughput'
-    | 'obj-total-concurrent-requests'
-    | 'obj-total-egress-throughput'
-    | 'obj-total-ingress-throughput';
+  resource_metric: QuotaResourceMetrics;
 
   /**
    * The S3 endpoint URL to which this limit applies.
    *
+   * For OBJ limits only.
    */
-  s3_endpoint: string;
+  s3_endpoint?: string;
 }
 
-/**
- * A Quota is a service used limit that is rated based on service metrics such
- * as vCPUs used, instances or storage size.
- */
-export type Quota =
-  | LinodeQuota
-  | LkeQuota
-  | ObjectStorageEndpointQuota
-  | ObjectStorageGlobalQuota;
-
 /**
  * A usage limit for a given Quota based on service metrics such
  * as vCPUs, instances or storage size.
@@ -128,8 +97,10 @@ export interface QuotaUsage {
   usage: null | number;
 }
 
-/**
- * Represents the type of service for a given quota, e.g. Linodes, Object Storage, etc.
- * The type must match the service part of the quota endpoint paths.
- */
-export type QuotaServiceType = 'linode' | 'lke' | 'object-storage';
+export const quotaTypes = {
+  linode: 'Linodes',
+  lke: 'Kubernetes',
+  'object-storage': 'Object Storage',
+} as const;
+
+export type QuotaType = keyof typeof quotaTypes;