private/apigen,satellite/console: fix console generated API

Update api generator and console type definitions so that the console generated API can be regenerated without errors. This change does not include a test to ensure that breaking changes do not get merged, but that will be included in a following change. https: //github.com//issues/6678 Change-Id: I130947340b7419547e88ce7e634b180acb458c2e
storj · Jan 10, 2024 · 5effb82 · 5effb82
1 parent a8bc92d
commit 5effb82
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/private/apigen/tstypes.go b/private/apigen/tstypes.go
@@ -265,6 +265,10 @@ func GetClassFieldsFromStruct(t reflect.Type) []ClassField {
 				panic(err)
 			}
 
+			if jsonInfo.Skip {
+				continue
+			}
+
 			if !ok && !field.Anonymous {
 				panic(
 					fmt.Sprintf(
@@ -294,10 +298,6 @@ func GetClassFieldsFromStruct(t reflect.Type) []ClassField {
 
 			fieldNames[jsonInfo.FieldName] = struct{}{}
 
-			if jsonInfo.Skip {
-				continue
-			}
-
 			fields = append(
 				fields,
 				ClassField{

diff --git a/satellite/console/apikeys.go b/satellite/console/apikeys.go
@@ -62,8 +62,8 @@ type APIKeyInfo struct {
 	Secret          []byte    `json:"-"`
 	CreatedAt       time.Time `json:"createdAt"`
 
-	ProjectRateLimit  *int
-	ProjectBurstLimit *int
+	ProjectRateLimit  *int `json:"-"`
+	ProjectBurstLimit *int `json:"-"`
 }
 
 // APIKeyCursor holds info for api keys cursor pagination.

diff --git a/satellite/console/consoleweb/consoleapi/apidocs.gen.md b/satellite/console/consoleweb/consoleapi/apidocs.gen.md
@@ -1,6 +1,6 @@
 # API Docs
 
-**Description: **Interacts with projects
+**Description:** Interacts with projects
 
 **Version:** `v0`
 
@@ -60,6 +60,7 @@ Creates new Project with given info
 	userSpecifiedBandwidthLimit: string // Amount of memory formatted as `15 GB`
 	segmentLimit: number
 	defaultPlacement: number
+	defaultVersioning: number
 }
 
 ```
@@ -110,6 +111,7 @@ Updates project with given info
 	userSpecifiedBandwidthLimit: string // Amount of memory formatted as `15 GB`
 	segmentLimit: number
 	defaultPlacement: number
+	defaultVersioning: number
 }
 
 ```
@@ -154,6 +156,7 @@ Gets all projects user has
 		userSpecifiedBandwidthLimit: string // Amount of memory formatted as `15 GB`
 		segmentLimit: number
 		defaultPlacement: number
+		defaultVersioning: number
 	}
 
 ]

diff --git a/web/satellite/src/api/v0.gen.ts b/web/satellite/src/api/v0.gen.ts
@@ -67,6 +67,7 @@ export class Project {
     userSpecifiedBandwidthLimit: MemorySize | null;
     segmentLimit: number | null;
     defaultPlacement: number;
+    defaultVersioning: number;
 }
 
 export class ResponseUser {