Merge pull request #318 from NorskHelsenett/feature/adding-enums-again

Adding enums for typescript
NorskHelsenett · Jan 28, 2025 · bb3b859 · bb3b859
2 parents b17ef64 + c3d7a2c
commit bb3b859
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 103 deletions.
diff --git a/cmd/generator/main.go b/cmd/generator/main.go
@@ -35,6 +35,7 @@ import (
 
 	"github.com/NorskHelsenett/ror/pkg/rorresources"
 	"github.com/NorskHelsenett/ror/pkg/rorresources/rordefs"
+	"github.com/NorskHelsenett/ror/pkg/rorresources/rortypes"
 	"github.com/tkrajina/typescriptify-golang-structs/typescriptify"
 )
 
@@ -154,6 +155,9 @@ func generateTypescriptModels() {
 	converter := typescriptify.New()
 	converter.CreateInterface = true
 	converter.CreateConstructor = true
+	converter.AddEnum(rortypes.AllVulnerabilityStatuses)
+	converter.AddEnum(rortypes.AllVulnerabilityDismissalReasons)
+	converter.AddEnum(rortypes.AllResourceTagProperties)
 
 	converter.Add(rorresources.ResourceSet{})
 	converter.Add(rorresources.ResourceQuery{})

diff --git a/pkg/rorresources/rortypes/resource_common_models.go b/pkg/rorresources/rortypes/resource_common_models.go
@@ -29,6 +29,19 @@ const (
 	TagPropertiesColor ResourceTagProperties = "color"
 )
 
+var AllResourceTagProperties = []ResourceTagProperties{
+	TagPropertiesColor,
+}
+
+func (p ResourceTagProperties) TSName() string {
+	switch p {
+	case TagPropertiesColor:
+		return "color"
+	default:
+		return "unknown"
+	}
+}
+
 // Commonresource defines the minimum resource definition.
 type CommonResource struct {
 	metav1.TypeMeta `json:",inline"`

diff --git a/typescript/models/package-lock.json b/typescript/models/package-lock.json
diff --git a/typescript/models/src/resources.ts b/typescript/models/src/resources.ts
@@ -1,14 +1,29 @@
 /* Do not change, this code is generated from Golang structs */
 
+export enum VulnerabilityStatus {
+  NOT_ASSESSED = 0,
+  NEEDS_TRIAGE = 1,
+  CONFIRMED = 2,
+  DISMISSED = 3,
+}
+export enum VulnerabilityDismissalReason {
+  ACCEPTABLE_RISK = 0,
+  FALSE_POSITIVE = 1,
+  NOT_APPLICABLE = 2,
+}
+export enum ResourceTagProperties {
+  color = 'color',
+}
 export interface ResourceBackupJobSpec {
   name: string;
   status: string;
   sourceName: string;
   sourceId: string;
   policyId: string;
-  directBackupTarget: ResourceIndirectBackupTarget[];
-  indirectBackupTarget: ResourceDirectBackupTarget[];
-  backupDestination: ResourceBackupDestination[];
+  policyName: string;
+  activeTargets: ResourceBackupTarget[];
+  indirectBackupTargets: ResourceIndirectBackupTarget[];
+  backupDestinations: ResourceBackupDestination[];
   startTime: Time;
   endTime: Time;
   expiryTime: Time;
@@ -19,45 +34,49 @@ export interface ResourceBackupStorage {
   logicalSize: number;
   physicalSize: number;
 }
-export interface ResourceBackupDestination {
-  name: string;
-  id: string;
-  type: string;
-  Status: string;
-  expiryTime: Time;
-}
-export interface ResourceBackupTarget {
-  name: string;
-  id: string;
-  externalIds: { [key: string]: string };
-}
-export interface ResourceDirectBackupTarget {
+export interface ResourceBackupRun {
   backupTargets: ResourceBackupTarget[];
-  backupDestination: ResourceBackupDestination[];
+  backupDestinations: ResourceBackupDestination[];
   startTime: Time;
   endTime: Time;
   expiryTime: Time;
   backupStorage: ResourceBackupStorage;
 }
+export interface ResourceBackupDestination {
+  name: string;
+  id: string;
+  type: string;
+  status: string;
+  expiryTime: Time;
+}
 export interface ResourceIndirectBackupTarget {
   type: string;
   ids: string[];
   keyValues: { [key: string]: string[] };
 }
+export interface ResourceBackupTarget {
+  name: string;
+  id: string;
+  externalIds: { [key: string]: string };
+}
 export interface ResourceBackupJobStatus {
   name: string;
   status: string;
   sourceName: string;
   sourceId: string;
   policyId: string;
-  directBackupTarget: ResourceIndirectBackupTarget[];
-  indirectBackupTarget: ResourceDirectBackupTarget[];
-  backupDestination: ResourceBackupDestination[];
+  policyName: string;
+  activeTargets: ResourceBackupTarget[];
+  indirectBackupTargets: ResourceIndirectBackupTarget[];
+  backupDestinations: ResourceBackupDestination[];
   startTime: Time;
   endTime: Time;
   expiryTime: Time;
+  runs: ResourceBackupRun[];
 }
 export interface ResourceBackupJob {
+  id: string;
+  provider: string;
   status: ResourceBackupJobStatus;
   spec: ResourceBackupJobSpec;
 }
@@ -295,9 +314,9 @@ export interface ResourceRoute {
   spec: ResourceRouteSpec;
 }
 export interface ResourceClusterVulnerabilityReportReportStatus {
-  status: number;
+  status: VulnerabilityStatus;
   until?: Time;
-  reason?: number;
+  reason?: VulnerabilityDismissalReason;
   comment?: string;
   riskAssessment?: string;
 }
@@ -1067,7 +1086,7 @@ export interface ResourceNamespace {}
 export interface ResourceTag {
   key: string;
   value: string;
-  properties: { [key: string]: string };
+  properties: { [key: ResourceTagProperties]: string };
 }
 export interface RorResourceOwnerReference {
   scope: string;