Merge pull request #507 from yaacov/add-missing-types

Add global host and vm types

packages/mocks/src/definitions/basic/index.ts

@@ -10,6 +10,5 @@ export * from './nicProfiles.mock';
 export * from './plans.mock';
 export * from './providers.mock';
 export * from './storages.mock';
-export * from './tlsCertificates.mock';
 export * from './tree.mock';
 export * from './vms.mock';

packages/mocks/src/definitions/basic/providers.mock.ts

@@ -1,11 +1,11 @@
 /* eslint-disable @cspell/spellchecker */
 import {
   ForkliftControllerModelGroupVersionKind,
-  InventoryByType,
   OpenshiftProvider,
   OpenstackProvider,
   OVirtProvider,
   ProviderModelGroupVersionKind as gvk,
+  ProvidersInventory,
   V1beta1Provider,
   V1beta1ProviderStatus,
   VSphereProvider,
@@ -451,7 +451,7 @@ export const openshiftProviderHost: OpenshiftProvider = {
   },
 };
 
-export const MOCK_INVENTORY_PROVIDERS: InventoryByType = {
+export const MOCK_INVENTORY_PROVIDERS: ProvidersInventory = {
   vsphere: [vmwareProvider1, vmwareProvider2, vmwareProvider3],
   ovirt: [rhvProvider1, rhvProvider1i, rhvProvider2, rhvProvider3],
   openstack: [openstackProvider1, openstackProvider2],

packages/mocks/src/definitions/utils.ts

@@ -3,7 +3,6 @@ import { DateTime } from 'luxon';
 
 import {
   ForkliftControllerModelGroupVersionKind,
-  InventoryByType,
   IoK8sApimachineryPkgApisMetaV1ObjectMeta,
   OpenShiftNamespace,
   OpenShiftNetworkAttachmentDefinition,
@@ -16,6 +15,7 @@ import {
   OVirtStorageDomain,
   OvirtTreeNode,
   OVirtVM,
+  ProvidersInventory,
   V1beta1Provider,
   VSphereDataStore,
   VSphereHostInventory,
@@ -44,7 +44,7 @@ export const disks = ({
   ovirt,
   openstack,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   ovirt: { [uid: string]: OVirtDisk[] };
   openstack: OpenstackVolumeType[];
@@ -62,7 +62,7 @@ export const vms = ({
   vsphere,
   ovirt,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   vsphere: { [uid: string]: VSphereVM[] };
   ovirt: { [uid: string]: OVirtVM[] };
@@ -77,7 +77,7 @@ export const hosts = ({
   inventoryPath,
   vsphere,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   vsphere: { [uid: string]: VSphereHostInventory[] };
 }) =>
@@ -91,7 +91,7 @@ export const namespaces = ({
   inventoryPath,
   openshift,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   openshift: { [uid: string]: OpenShiftNamespace[] };
 }) =>
@@ -107,7 +107,7 @@ export const networks = ({
   ovirt,
   openshift,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   vsphere: { [uid: string]: VSphereNetwork[] };
   ovirt: { [uid: string]: OVirtNetwork[] };
@@ -128,7 +128,7 @@ export const nicProfiles = ({
   inventoryPath,
   ovirt,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   ovirt: { [uid: string]: OVirtNicProfile[] };
 }) =>
@@ -145,7 +145,7 @@ export const storages = ({
   openstack,
   openshift,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   vsphere: { [uid: string]: VSphereDataStore[] };
   ovirt: { [uid: string]: OVirtStorageDomain[] };
@@ -177,7 +177,7 @@ export const trees = ({
   ovirt,
   openstack,
 }: {
-  providers: InventoryByType;
+  providers: ProvidersInventory;
   inventoryPath: string;
   vsphere: {
     hostTree: { [uid: string]: VSphereTreeNode };

packages/types/src/types/ProviderHost.ts

@@ -0,0 +1,8 @@
+/** Unified file containing typed provider secrets */
+
+import { OVirtHost, VSphereHost } from './provider';
+
+/**
+ * General provider host inventory
+ */
+export type ProviderHost = OVirtHost | VSphereHost;

packages/types/src/types/ProviderSecret.ts

@@ -1,9 +1,11 @@
 /** Unified file containing typed provider secrets */
 
-import { OpenShiftProviderSecret } from './secret/OpenShiftProviderSecret';
-import { OpenstackProviderSecret } from './secret/OpenstackProviderSecret';
-import { OVirtProviderSecret } from './secret/OVirtProviderSecret';
-import { VSphereProviderSecret } from './secret/VSphereProviderSecret';
+import {
+  OpenShiftProviderSecret,
+  OpenstackProviderSecret,
+  OVirtProviderSecret,
+  VSphereProviderSecret,
+} from './secret';
 
 export type ProviderType = 'openshift' | 'vsphere' | 'ovirt' | 'openstack';
 

packages/types/src/types/ProviderVM.ts

@@ -0,0 +1,8 @@
+/** Unified file containing typed provider secrets */
+
+import { OpenshiftVM, OpenstackVM, OVirtVM, VSphereVM } from './provider';
+
+/**
+ * General provider virtual machine inventory
+ */
+export type ProviderVirtualMachine = OpenshiftVM | OVirtVM | VSphereVM | OpenstackVM;

packages/types/src/types/InventoryByType.ts → packages/types/src/types/ProvidersInventory.ts

@@ -3,7 +3,7 @@ import { OpenshiftProvider, OpenstackProvider, OVirtProvider, VSphereProvider }
 /**
  * Represents the inventory of providers, including their entities.
  */
-export interface InventoryByType {
+export interface ProvidersInventory {
   openshift?: OpenshiftProvider[] | null;
   openstack?: OpenstackProvider[] | null;
   ovirt?: OVirtProvider[] | null;

packages/types/src/types/index.ts

@@ -1,11 +1,12 @@
 // @index('./*', f => `export * from '${f.path}';`)
 export * from './host';
-export * from './InventoryByType';
 export * from './k8s';
 export * from './MustGatherResponse';
 export * from './provider';
+export * from './ProviderHost';
 export * from './ProviderInventory';
 export * from './ProviderSecret';
+export * from './ProvidersInventory';
+export * from './ProviderVM';
 export * from './secret';
-export * from './TLSCertificate';
 // @endindex

packages/types/src/types/k8s/K8sResourceCommon.ts

@@ -0,0 +1,7 @@
+import { IoK8sApimachineryPkgApisMetaV1ObjectMeta } from '../../models';
+
+export interface K8sResourceCommon {
+  apiVersion?: string;
+  kind?: string;
+  metadata?: IoK8sApimachineryPkgApisMetaV1ObjectMeta;
+}

packages/types/src/types/k8s/K8sResourceCondition.ts

@@ -0,0 +1,7 @@
+export interface K8sResourceCondition {
+  type: string;
+  status: string;
+  lastTransitionTime?: string;
+  reason?: string;
+  message?: string;
+}

packages/types/src/types/k8s/Namespace.ts → packages/types/src/types/k8s/V1Namespace.ts

@@ -1,10 +1,8 @@
 import { IoK8sApimachineryPkgApisMetaV1ObjectMeta } from '../../models';
 
-export interface Namespace {
+export interface V1Namespace {
   kind: 'Namespace';
   apiVersion: string;
 
   metadata?: IoK8sApimachineryPkgApisMetaV1ObjectMeta;
 }
-
-export type V1Namespace = Namespace;

packages/types/src/types/k8s/V1NetworkAttachmentDefinition.ts

@@ -1,9 +1,7 @@
 import { IoK8sApimachineryPkgApisMetaV1ObjectMeta } from '../../models';
 
-export interface NetworkAttachmentDefinition {
+export interface V1NetworkAttachmentDefinition {
   kind: 'NetworkAttachmentDefinition';
   apiVersion: 'k8s.cni.cncf.io/v1';
   metadata?: IoK8sApimachineryPkgApisMetaV1ObjectMeta;
 }
-
-export type V1NetworkAttachmentDefinition = NetworkAttachmentDefinition;

packages/types/src/types/k8s/V1Secret.ts

@@ -1,12 +1,10 @@
 import { IoK8sApimachineryPkgApisMetaV1ObjectMeta } from '../../models';
 
-interface Secret {
+export interface V1Secret {
   apiVersion?: string;
   kind?: string;
   immutable?: boolean;
   data?: Record<string, string>;
   metadata?: IoK8sApimachineryPkgApisMetaV1ObjectMeta;
   type?: string;
 }
-
-export type V1Secret = Secret;

packages/types/src/types/k8s/index.ts

@@ -1,6 +1,6 @@
 // @index('./*.ts', f => `export * from '${f.path}';`)
 export * from './IoK8sApiStorageV1StorageClass';
-export * from './Namespace';
+export * from './V1Namespace';
 export * from './V1NetworkAttachmentDefinition';
 export * from './V1Secret';
 // @endindex

packages/types/src/types/provider/openshift/Namespace.ts

@@ -1,4 +1,4 @@
-import { V1Namespace } from '../../k8s/Namespace';
+import { V1Namespace } from '../../k8s/V1Namespace';
 
 import { OpenshiftResource } from './Resource';
 

packages/types/src/types/provider/openshift/VM.ts

@@ -0,0 +1,3 @@
+import { OpenshiftResource } from './Resource';
+
+export type OpenshiftVM = OpenshiftResource;

packages/types/src/types/provider/openshift/index.ts

@@ -4,4 +4,5 @@ export * from './NetworkAttachmentDefinition';
 export * from './Provider';
 export * from './Resource';
 export * from './StorageClass';
+export * from './VM';
 // @endindex

packages/types/src/types/provider/vsphere/Host.ts

@@ -0,0 +1,3 @@
+import { VSphereResource } from './Resource';
+
+export type VSphereHost = VSphereResource;

packages/types/src/types/provider/vsphere/index.ts

@@ -1,5 +1,6 @@
 // @index('./*.ts', f => `export * from '${f.path}';`)
 export * from './DataStore';
+export * from './Host';
 export * from './model';
 export * from './Network';
 export * from './Provider';