@cirrobio/api-client 0.1.3 → 0.1.4

package/.openapi-generator/FILES

@@ -28,6 +28,7 @@ src/models/BillingAccountRequest.ts
 src/models/BillingMethod.ts
 src/models/BudgetPeriod.ts
 src/models/CloudAccount.ts
+src/models/CloudAccountType.ts
 src/models/ColumnDefinition.ts
 src/models/Contact.ts
 src/models/CreateNotebookInstanceRequest.ts

package/README.md

@@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co
 _published:_
 
 ```
-npm install @cirrobio/api-client@0.1.3 --save
+npm install @cirrobio/api-client@0.1.4 --save
 ```
 
 _unPublished (not recommended):_

package/dist/models/AuditEvent.d.ts

@@ -52,7 +52,7 @@ export interface AuditEvent {
      */
     eventDetail?: {
         [key: string]: any;
-    };
+    } | null;
     /**
      * The changes made to the entity (if applicable)
      * @type {{ [key: string]: string; }}
@@ -60,7 +60,7 @@ export interface AuditEvent {
      */
     changes?: {
         [key: string]: string;
-    };
+    } | null;
     /**
      * The username of the user who performed the action
      * @type {string}

package/dist/models/CloudAccount.d.ts

@@ -9,6 +9,7 @@
  * https://openapi-generator.tech
  * Do not edit the class manually.
  */
+import type { CloudAccountType } from './CloudAccountType';
 /**
  *
  * @export
@@ -28,11 +29,17 @@ export interface CloudAccount {
      */
     accountName?: string;
     /**
-     * AWS Region Code
+     * AWS Region Code (defaults to region of Cirro app)
      * @type {string}
      * @memberof CloudAccount
      */
     regionName?: string;
+    /**
+     *
+     * @type {CloudAccountType}
+     * @memberof CloudAccount
+     */
+    accountType: CloudAccountType;
 }
 /**
  * Check if a given object implements the CloudAccount interface.

package/dist/models/CloudAccount.js

@@ -15,11 +15,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CloudAccountToJSON = exports.CloudAccountFromJSONTyped = exports.CloudAccountFromJSON = exports.instanceOfCloudAccount = void 0;
 var runtime_1 = require("../runtime");
+var CloudAccountType_1 = require("./CloudAccountType");
 /**
  * Check if a given object implements the CloudAccount interface.
  */
 function instanceOfCloudAccount(value) {
     var isInstance = true;
+    isInstance = isInstance && "accountType" in value;
     return isInstance;
 }
 exports.instanceOfCloudAccount = instanceOfCloudAccount;
@@ -35,6 +37,7 @@ function CloudAccountFromJSONTyped(json, ignoreDiscriminator) {
         'accountId': !(0, runtime_1.exists)(json, 'accountId') ? undefined : json['accountId'],
         'accountName': !(0, runtime_1.exists)(json, 'accountName') ? undefined : json['accountName'],
         'regionName': !(0, runtime_1.exists)(json, 'regionName') ? undefined : json['regionName'],
+        'accountType': (0, CloudAccountType_1.CloudAccountTypeFromJSON)(json['accountType']),
     };
 }
 exports.CloudAccountFromJSONTyped = CloudAccountFromJSONTyped;
@@ -49,6 +52,7 @@ function CloudAccountToJSON(value) {
         'accountId': value.accountId,
         'accountName': value.accountName,
         'regionName': value.regionName,
+        'accountType': (0, CloudAccountType_1.CloudAccountTypeToJSON)(value.accountType),
     };
 }
 exports.CloudAccountToJSON = CloudAccountToJSON;

package/dist/models/CloudAccountType.d.ts

@@ -0,0 +1,23 @@
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+/**
+ * Type of cloud account (Hosted by Cirro, or Bring your own account)
+ * @export
+ * @enum {string}
+ */
+export declare enum CloudAccountType {
+    Hosted = "HOSTED",
+    Byoa = "BYOA"
+}
+export declare function CloudAccountTypeFromJSON(json: any): CloudAccountType;
+export declare function CloudAccountTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean): CloudAccountType;
+export declare function CloudAccountTypeToJSON(value?: CloudAccountType | null): any;

package/dist/models/CloudAccountType.js

@@ -0,0 +1,38 @@
+"use strict";
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CloudAccountTypeToJSON = exports.CloudAccountTypeFromJSONTyped = exports.CloudAccountTypeFromJSON = exports.CloudAccountType = void 0;
+/**
+ * Type of cloud account (Hosted by Cirro, or Bring your own account)
+ * @export
+ * @enum {string}
+ */
+var CloudAccountType;
+(function (CloudAccountType) {
+    CloudAccountType["Hosted"] = "HOSTED";
+    CloudAccountType["Byoa"] = "BYOA";
+})(CloudAccountType = exports.CloudAccountType || (exports.CloudAccountType = {}));
+function CloudAccountTypeFromJSON(json) {
+    return CloudAccountTypeFromJSONTyped(json, false);
+}
+exports.CloudAccountTypeFromJSON = CloudAccountTypeFromJSON;
+function CloudAccountTypeFromJSONTyped(json, ignoreDiscriminator) {
+    return json;
+}
+exports.CloudAccountTypeFromJSONTyped = CloudAccountTypeFromJSONTyped;
+function CloudAccountTypeToJSON(value) {
+    return value;
+}
+exports.CloudAccountTypeToJSON = CloudAccountTypeToJSON;

package/dist/models/ProjectSettings.d.ts

@@ -77,11 +77,11 @@ export interface ProjectSettings {
      */
     retentionPolicyDays?: number;
     /**
-     *
+     * List of service connections to enable
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
-    serviceConnections: Array<string>;
+    serviceConnections?: Array<string>;
     /**
      * VPC that the compute environment will use
      * @type {string}
@@ -89,11 +89,17 @@ export interface ProjectSettings {
      */
     vpcId?: string | null;
     /**
-     *
+     * List of subnets that the compute environment will use
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
     batchSubnets?: Array<string> | null;
+    /**
+     * List of subnets that the sagemaker instances will use
+     * @type {Array<string>}
+     * @memberof ProjectSettings
+     */
+    sagemakerSubnets?: Array<string> | null;
     /**
      * KMS Key ARN to encrypt S3 objects, if not provided, default bucket encryption will be used
      * @type {string}

package/dist/models/ProjectSettings.js

@@ -23,7 +23,6 @@ function instanceOfProjectSettings(value) {
     var isInstance = true;
     isInstance = isInstance && "budgetAmount" in value;
     isInstance = isInstance && "budgetPeriod" in value;
-    isInstance = isInstance && "serviceConnections" in value;
     return isInstance;
 }
 exports.instanceOfProjectSettings = instanceOfProjectSettings;
@@ -46,9 +45,10 @@ function ProjectSettingsFromJSONTyped(json, ignoreDiscriminator) {
         'maxF1VCPU': !(0, runtime_1.exists)(json, 'maxF1VCPU') ? undefined : json['maxF1VCPU'],
         'maxSpotVCPU': !(0, runtime_1.exists)(json, 'maxSpotVCPU') ? undefined : json['maxSpotVCPU'],
         'retentionPolicyDays': !(0, runtime_1.exists)(json, 'retentionPolicyDays') ? undefined : json['retentionPolicyDays'],
-        'serviceConnections': json['serviceConnections'],
+        'serviceConnections': !(0, runtime_1.exists)(json, 'serviceConnections') ? undefined : json['serviceConnections'],
         'vpcId': !(0, runtime_1.exists)(json, 'vpcId') ? undefined : json['vpcId'],
         'batchSubnets': !(0, runtime_1.exists)(json, 'batchSubnets') ? undefined : json['batchSubnets'],
+        'sagemakerSubnets': !(0, runtime_1.exists)(json, 'sagemakerSubnets') ? undefined : json['sagemakerSubnets'],
         'kmsArn': !(0, runtime_1.exists)(json, 'kmsArn') ? undefined : json['kmsArn'],
     };
 }
@@ -74,6 +74,7 @@ function ProjectSettingsToJSON(value) {
         'serviceConnections': value.serviceConnections,
         'vpcId': value.vpcId,
         'batchSubnets': value.batchSubnets,
+        'sagemakerSubnets': value.sagemakerSubnets,
         'kmsArn': value.kmsArn,
     };
 }

package/dist/models/SyncStatus.d.ts

@@ -10,7 +10,7 @@
  * Do not edit the class manually.
  */
 /**
- * Status of last sync
+ * Status of the last sync operation
  * @export
  * @enum {string}
  */

package/dist/models/SyncStatus.js

@@ -15,7 +15,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SyncStatusToJSON = exports.SyncStatusFromJSONTyped = exports.SyncStatusFromJSON = exports.SyncStatus = void 0;
 /**
- * Status of last sync
+ * Status of the last sync operation
  * @export
  * @enum {string}
  */

package/dist/models/index.d.ts

@@ -8,6 +8,7 @@ export * from './BillingAccountRequest';
 export * from './BillingMethod';
 export * from './BudgetPeriod';
 export * from './CloudAccount';
+export * from './CloudAccountType';
 export * from './ColumnDefinition';
 export * from './Contact';
 export * from './CreateNotebookInstanceRequest';

package/dist/models/index.js

@@ -26,6 +26,7 @@ __exportStar(require("./BillingAccountRequest"), exports);
 __exportStar(require("./BillingMethod"), exports);
 __exportStar(require("./BudgetPeriod"), exports);
 __exportStar(require("./CloudAccount"), exports);
+__exportStar(require("./CloudAccountType"), exports);
 __exportStar(require("./ColumnDefinition"), exports);
 __exportStar(require("./Contact"), exports);
 __exportStar(require("./CreateNotebookInstanceRequest"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cirrobio/api-client",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "API client for Cirro",
   "author": "CirroBio",
   "repository": {

package/src/models/AuditEvent.ts

@@ -54,13 +54,13 @@ export interface AuditEvent {
      * @type {{ [key: string]: any; }}
      * @memberof AuditEvent
      */
-    eventDetail?: { [key: string]: any; };
+    eventDetail?: { [key: string]: any; } | null;
     /**
      * The changes made to the entity (if applicable)
      * @type {{ [key: string]: string; }}
      * @memberof AuditEvent
      */
-    changes?: { [key: string]: string; };
+    changes?: { [key: string]: string; } | null;
     /**
      * The username of the user who performed the action
      * @type {string}

package/src/models/CloudAccount.ts

@@ -13,6 +13,13 @@
  */
 
 import { exists, mapValues } from '../runtime';
+import type { CloudAccountType } from './CloudAccountType';
+import {
+    CloudAccountTypeFromJSON,
+    CloudAccountTypeFromJSONTyped,
+    CloudAccountTypeToJSON,
+} from './CloudAccountType';
+
 /**
  * 
  * @export
@@ -32,11 +39,17 @@ export interface CloudAccount {
      */
     accountName?: string;
     /**
-     * AWS Region Code
+     * AWS Region Code (defaults to region of Cirro app)
      * @type {string}
      * @memberof CloudAccount
      */
     regionName?: string;
+    /**
+     * 
+     * @type {CloudAccountType}
+     * @memberof CloudAccount
+     */
+    accountType: CloudAccountType;
 }
 
 /**
@@ -44,6 +57,7 @@ export interface CloudAccount {
  */
 export function instanceOfCloudAccount(value: object): boolean {
     let isInstance = true;
+    isInstance = isInstance && "accountType" in value;
 
     return isInstance;
 }
@@ -61,6 +75,7 @@ export function CloudAccountFromJSONTyped(json: any, ignoreDiscriminator: boolea
         'accountId': !exists(json, 'accountId') ? undefined : json['accountId'],
         'accountName': !exists(json, 'accountName') ? undefined : json['accountName'],
         'regionName': !exists(json, 'regionName') ? undefined : json['regionName'],
+        'accountType': CloudAccountTypeFromJSON(json['accountType']),
     };
 }
 
@@ -76,6 +91,7 @@ export function CloudAccountToJSON(value?: CloudAccount | null): any {
         'accountId': value.accountId,
         'accountName': value.accountName,
         'regionName': value.regionName,
+        'accountType': CloudAccountTypeToJSON(value.accountType),
     };
 }
 

package/src/models/CloudAccountType.ts

@@ -0,0 +1,37 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Cirro Data
+ * Cirro Data Platform service API
+ *
+ * The version of the OpenAPI document: latest
+ * Contact: support@cirro.bio
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/**
+ * Type of cloud account (Hosted by Cirro, or Bring your own account)
+ * @export
+ * @enum {string}
+ */
+export enum CloudAccountType {
+    Hosted = 'HOSTED',
+    Byoa = 'BYOA'
+}
+
+
+export function CloudAccountTypeFromJSON(json: any): CloudAccountType {
+    return CloudAccountTypeFromJSONTyped(json, false);
+}
+
+export function CloudAccountTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean): CloudAccountType {
+    return json as CloudAccountType;
+}
+
+export function CloudAccountTypeToJSON(value?: CloudAccountType | null): any {
+    return value as any;
+}
+

package/src/models/ProjectSettings.ts

@@ -87,11 +87,11 @@ export interface ProjectSettings {
      */
     retentionPolicyDays?: number;
     /**
-     * 
+     * List of service connections to enable
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
-    serviceConnections: Array<string>;
+    serviceConnections?: Array<string>;
     /**
      * VPC that the compute environment will use
      * @type {string}
@@ -99,11 +99,17 @@ export interface ProjectSettings {
      */
     vpcId?: string | null;
     /**
-     * 
+     * List of subnets that the compute environment will use
      * @type {Array<string>}
      * @memberof ProjectSettings
      */
     batchSubnets?: Array<string> | null;
+    /**
+     * List of subnets that the sagemaker instances will use
+     * @type {Array<string>}
+     * @memberof ProjectSettings
+     */
+    sagemakerSubnets?: Array<string> | null;
     /**
      * KMS Key ARN to encrypt S3 objects, if not provided, default bucket encryption will be used
      * @type {string}
@@ -119,7 +125,6 @@ export function instanceOfProjectSettings(value: object): boolean {
     let isInstance = true;
     isInstance = isInstance && "budgetAmount" in value;
     isInstance = isInstance && "budgetPeriod" in value;
-    isInstance = isInstance && "serviceConnections" in value;
 
     return isInstance;
 }
@@ -144,9 +149,10 @@ export function ProjectSettingsFromJSONTyped(json: any, ignoreDiscriminator: boo
         'maxF1VCPU': !exists(json, 'maxF1VCPU') ? undefined : json['maxF1VCPU'],
         'maxSpotVCPU': !exists(json, 'maxSpotVCPU') ? undefined : json['maxSpotVCPU'],
         'retentionPolicyDays': !exists(json, 'retentionPolicyDays') ? undefined : json['retentionPolicyDays'],
-        'serviceConnections': json['serviceConnections'],
+        'serviceConnections': !exists(json, 'serviceConnections') ? undefined : json['serviceConnections'],
         'vpcId': !exists(json, 'vpcId') ? undefined : json['vpcId'],
         'batchSubnets': !exists(json, 'batchSubnets') ? undefined : json['batchSubnets'],
+        'sagemakerSubnets': !exists(json, 'sagemakerSubnets') ? undefined : json['sagemakerSubnets'],
         'kmsArn': !exists(json, 'kmsArn') ? undefined : json['kmsArn'],
     };
 }
@@ -173,6 +179,7 @@ export function ProjectSettingsToJSON(value?: ProjectSettings | null): any {
         'serviceConnections': value.serviceConnections,
         'vpcId': value.vpcId,
         'batchSubnets': value.batchSubnets,
+        'sagemakerSubnets': value.sagemakerSubnets,
         'kmsArn': value.kmsArn,
     };
 }

package/src/models/SyncStatus.ts

@@ -13,7 +13,7 @@
  */
 
 /**
- * Status of last sync
+ * Status of the last sync operation
  * @export
  * @enum {string}
  */

package/src/models/index.ts

@@ -10,6 +10,7 @@ export * from './BillingAccountRequest';
 export * from './BillingMethod';
 export * from './BudgetPeriod';
 export * from './CloudAccount';
+export * from './CloudAccountType';
 export * from './ColumnDefinition';
 export * from './Contact';
 export * from './CreateNotebookInstanceRequest';