refactor: merge serviceuser in service module (#157)

aiven · Oct 7, 2024 · 3813ec9 · 3813ec9
1 parent 907258e
commit 3813ec9
Show file tree

Hide file tree

Showing 6 changed files with 344 additions and 695 deletions.
diff --git a/client_generated.go b/client_generated.go
diff --git a/config.yaml b/config.yaml
@@ -292,7 +292,6 @@ Service:
   - ServiceTaskCreate
   - ServiceTaskGet
   - ServiceUpdate
-ServiceUser:
   - ServiceUserCreate
   - ServiceUserCredentialsModify
   - ServiceUserCredentialsReset

diff --git a/generator/models.go b/generator/models.go
@@ -26,10 +26,28 @@ type Doc struct {
 	} `json:"components"`
 }
 
+const componentIndex = 3
+
 func (d *Doc) getSchema(path string) (*Schema, error) {
-	name := strings.Split(path, "/")[3]
+	chunks := strings.Split(path, "/")
+	if len(chunks) < componentIndex+1 {
+		return nil, fmt.Errorf("invalid schema path %q", path)
+	}
 
+	name := chunks[componentIndex]
 	schema := d.Components.Schemas[name]
+	for i := componentIndex + 1; i < len(chunks); i++ {
+		switch k := chunks[i]; k {
+		case "items":
+			schema = schema.Items
+		case "properties":
+			schema = schema.Properties[chunks[i+1]]
+			i++
+		default:
+			return nil, fmt.Errorf("unknown schema path %v: %s", chunks, k)
+		}
+	}
+
 	if schema == nil {
 		return nil, fmt.Errorf("schema %q not found", path)
 	}