Query all secure bundles for Astra token

lukasz-antoniak · web-flow · commit b1c54afc7a30 · 2024-07-17T13:52:26.000+02:00
diff --git a/astra/bundle.go b/astra/bundle.go
@@ -149,7 +149,12 @@ func generateSecureBundleURLWithResponse(url, databaseID, token string, ctx cont
 	if err != nil {
 		return nil, err
 	}
-	res, err := client.GenerateSecureBundleURLWithResponse(ctx, databaseID, &astra.GenerateSecureBundleURLParams{})
+	// return all bundles, as returning only one causes issue with response deserializing
+	// client code generated by astra-client-go from Swagger definition does not support 'oneOf' clause
+	// used as a response of /v2/databases/{databaseID}/secureBundleURL endpoint
+	// (https://github.com/oapi-codegen/oapi-codegen/issues/1665)
+	returnAllBundles := true
+	res, err := client.GenerateSecureBundleURLWithResponse(ctx, databaseID, &astra.GenerateSecureBundleURLParams{All: &returnAllBundles})
 	if err != nil {
 		return nil, fmt.Errorf("error generating bundle urls: %v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,12 @@ func generateSecureBundleURLWithResponse(url, databaseID, token string, ctx cont`
`149`	`149`	`if err != nil {`
`150`	`150`	`return nil, err`
`151`	`151`	`}`
`152`		`- res, err := client.GenerateSecureBundleURLWithResponse(ctx, databaseID, &astra.GenerateSecureBundleURLParams{})`
	`152`	`+ // return all bundles, as returning only one causes issue with response deserializing`
	`153`	`+ // client code generated by astra-client-go from Swagger definition does not support 'oneOf' clause`
	`154`	`+ // used as a response of /v2/databases/{databaseID}/secureBundleURL endpoint`
	`155`	`+ // (https://github.com/oapi-codegen/oapi-codegen/issues/1665)`
	`156`	`+ returnAllBundles := true`
	`157`	`+ res, err := client.GenerateSecureBundleURLWithResponse(ctx, databaseID, &astra.GenerateSecureBundleURLParams{All: &returnAllBundles})`
`153`	`158`	`if err != nil {`
`154`	`159`	`return nil, fmt.Errorf("error generating bundle urls: %v", err)`
`155`	`160`	`}`