fix: update oct schema & a step (#19)

OpsMx · Nov 25, 2024 · b9e702d · b9e702d
1 parent 54bf01d
commit b9e702d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/schemas/october2024.go b/schemas/october2024.go
@@ -577,7 +577,7 @@ type BuildTool {
     tool: String! @search(by: [exact])
     "buildName is the name of the job/pipeline/action"
     buildName: String! @search(by: [exact, regexp])
-    buildUrl: String! @search(by: [exact])
+    buildUrl: String! @search(by: [exact,  regexp])
     "buildTime is the time at which the artifact was built"
     buildTime: DateTime
     "buildUser is the user that built the artifact"
@@ -729,7 +729,7 @@ type ComponentAnalysis {
     Licenses: [String!] @search(by: [exact,regexp])
     CreatedAt: DateTime
     ScannedAt: DateTime
-    LastViewed: DateTime
+    LastViewed: DateTime @search
 }
 
 type ComponentLicenses {
@@ -739,6 +739,7 @@ type ComponentLicenses {
 }
 
 enum Severity {
+    apocalypse
     critical
     high
     medium

diff --git a/september2024october2024/upgradesteps.go b/september2024october2024/upgradesteps.go
@@ -21,14 +21,14 @@ func UpgradeToOctober2024(prodGraphUrl, prodToken, restoreServiceUrl string, pro
 		return fmt.Errorf("UpgradeToSeptember2024: migrateBuildToSourceNode: %s", err.Error())
 	}
 
-	if err := updateComponent(prodDgraphClient); err != nil {
-		return fmt.Errorf("UpgradeToSeptember2024: updateComponent: %s", err.Error())
-	}
-
 	if err := graphqlfunc.UpdateSchema(prodGraphUrl, prodToken, []byte(schemas.October2024Schema)); err != nil {
 		return fmt.Errorf("UpgradeToOctober2024: UpdateSchema: %s", err.Error())
 	}
 
+	if err := updateComponent(prodDgraphClient); err != nil {
+		return fmt.Errorf("UpgradeToSeptember2024: updateComponent: %s", err.Error())
+	}
+
 	if restoreServiceUrl != "" {
 		if err := graphqlfunc.BackupAndRestoreDgraph(prodGraphUrl, restoreServiceUrl); err != nil {
 			return fmt.Errorf("UpgradeToOctober2024: BackupAndRestoreDgraph: %s", err.Error())