mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 09:32:25 -05:00 
			
		
		
		
	[bugfix] Fix Swagger spec and add test script (#2698)
* Add Swagger spec test script * Fix Swagger spec errors not related to statuses with polls * Add API tests that post a status with a poll * Fix creating a status with a poll from form params * Fix Swagger spec errors related to statuses with polls (this is the last error) * Fix Swagger spec warnings not related to unused definitions * Suppress a duplicate list update params definition that was somehow causing wrong param names * Add Swagger test to CI - updates Drone config - vendorizes go-swagger - fixes a file extension issue that caused the test script to generate JSON instead of YAML with the vendorized version * Put `Sample: ` on its own line everywhere * Remove unused id param from emojiCategoriesGet * Add 5 more pairs of profile fields to account update API Swagger * Remove Swagger prefix from dummy fields It makes the generated code look weird * Manually annotate params for statusCreate operation * Fix all remaining Swagger spec warnings - Change some models into operation parameters - Ignore models that already correspond to manually documented operation parameters but can't be trivially changed (those with file fields) * Documented that creating a status with scheduled_at isn't implemented yet * sign drone.yml * Fix filter API Swagger errors * fixup! Fix filter API Swagger errors --------- Co-authored-by: tobi <tobi.smethurst@protonmail.com>
This commit is contained in:
		
					parent
					
						
							
								68c8fe67cc
							
						
					
				
			
			
				commit
				
					
						fc3741365c
					
				
			
		
					 672 changed files with 135624 additions and 713 deletions
				
			
		
							
								
								
									
										90
									
								
								vendor/github.com/go-openapi/analysis/internal/flatten/operations/operations.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							
							
						
						
									
										90
									
								
								vendor/github.com/go-openapi/analysis/internal/flatten/operations/operations.go
									
										
									
										generated
									
									
										vendored
									
									
										Normal file
									
								
							|  | @ -0,0 +1,90 @@ | |||
| package operations | ||||
| 
 | ||||
| import ( | ||||
| 	"path" | ||||
| 	"sort" | ||||
| 	"strings" | ||||
| 
 | ||||
| 	"github.com/go-openapi/jsonpointer" | ||||
| 	"github.com/go-openapi/spec" | ||||
| 	"github.com/go-openapi/swag" | ||||
| ) | ||||
| 
 | ||||
| // AllOpRefsByRef returns an index of sortable operations | ||||
| func AllOpRefsByRef(specDoc Provider, operationIDs []string) map[string]OpRef { | ||||
| 	return OpRefsByRef(GatherOperations(specDoc, operationIDs)) | ||||
| } | ||||
| 
 | ||||
| // OpRefsByRef indexes a map of sortable operations | ||||
| func OpRefsByRef(oprefs map[string]OpRef) map[string]OpRef { | ||||
| 	result := make(map[string]OpRef, len(oprefs)) | ||||
| 	for _, v := range oprefs { | ||||
| 		result[v.Ref.String()] = v | ||||
| 	} | ||||
| 
 | ||||
| 	return result | ||||
| } | ||||
| 
 | ||||
| // OpRef is an indexable, sortable operation | ||||
| type OpRef struct { | ||||
| 	Method string | ||||
| 	Path   string | ||||
| 	Key    string | ||||
| 	ID     string | ||||
| 	Op     *spec.Operation | ||||
| 	Ref    spec.Ref | ||||
| } | ||||
| 
 | ||||
| // OpRefs is a sortable collection of operations | ||||
| type OpRefs []OpRef | ||||
| 
 | ||||
| func (o OpRefs) Len() int           { return len(o) } | ||||
| func (o OpRefs) Swap(i, j int)      { o[i], o[j] = o[j], o[i] } | ||||
| func (o OpRefs) Less(i, j int) bool { return o[i].Key < o[j].Key } | ||||
| 
 | ||||
| // Provider knows how to collect operations from a spec | ||||
| type Provider interface { | ||||
| 	Operations() map[string]map[string]*spec.Operation | ||||
| } | ||||
| 
 | ||||
| // GatherOperations builds a map of sorted operations from a spec | ||||
| func GatherOperations(specDoc Provider, operationIDs []string) map[string]OpRef { | ||||
| 	var oprefs OpRefs | ||||
| 
 | ||||
| 	for method, pathItem := range specDoc.Operations() { | ||||
| 		for pth, operation := range pathItem { | ||||
| 			vv := *operation | ||||
| 			oprefs = append(oprefs, OpRef{ | ||||
| 				Key:    swag.ToGoName(strings.ToLower(method) + " " + pth), | ||||
| 				Method: method, | ||||
| 				Path:   pth, | ||||
| 				ID:     vv.ID, | ||||
| 				Op:     &vv, | ||||
| 				Ref:    spec.MustCreateRef("#" + path.Join("/paths", jsonpointer.Escape(pth), method)), | ||||
| 			}) | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	sort.Sort(oprefs) | ||||
| 
 | ||||
| 	operations := make(map[string]OpRef) | ||||
| 	for _, opr := range oprefs { | ||||
| 		nm := opr.ID | ||||
| 		if nm == "" { | ||||
| 			nm = opr.Key | ||||
| 		} | ||||
| 
 | ||||
| 		oo, found := operations[nm] | ||||
| 		if found && oo.Method != opr.Method && oo.Path != opr.Path { | ||||
| 			nm = opr.Key | ||||
| 		} | ||||
| 
 | ||||
| 		if len(operationIDs) == 0 || swag.ContainsStrings(operationIDs, opr.ID) || swag.ContainsStrings(operationIDs, nm) { | ||||
| 			opr.ID = nm | ||||
| 			opr.Op.ID = nm | ||||
| 			operations[nm] = opr | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	return operations | ||||
| } | ||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue