write object only if no marshalling error, typos

This commit is contained in:
cadenmarchese 2023-01-11 08:56:02 -05:00 коммит произвёл Caden Marchese
Родитель 7e212590a0
Коммит ae47279bdc
2 изменённых файлов: 10 добавлений и 9 удалений

Просмотреть файл

@ -32,14 +32,14 @@ func (f *frontend) listAdminOpenShiftClusterResources(w http.ResponseWriter, r *
func (f *frontend) _listAdminOpenShiftClusterResources(
ctx context.Context, r *http.Request, writer io.WriteCloser, log *logrus.Entry) error {
a, err := f.newStremAzureAction(ctx, r, log)
a, err := f.newStreamAzureAction(ctx, r, log)
if err != nil {
return err
}
return a.WriteToStream(ctx, writer)
}
func (f *frontend) newStremAzureAction(ctx context.Context, r *http.Request, log *logrus.Entry) (adminactions.AzureActions, error) {
func (f *frontend) newStreamAzureAction(ctx context.Context, r *http.Request, log *logrus.Entry) (adminactions.AzureActions, error) {
vars := mux.Vars(r)
resourceID := strings.TrimPrefix(r.URL.Path, "/admin")

Просмотреть файл

@ -17,7 +17,7 @@ import (
"github.com/Azure/ARO-RP/pkg/util/subnet"
)
var comaAsByteArray = []byte(",")
var commaAsByteArray = []byte(",")
func (a *azureActions) GroupResourceList(ctx context.Context) ([]mgmtfeatures.GenericResourceExpanded, error) {
clusterRGName := stringutils.LastTokenByte(a.oc.Properties.ClusterProfile.ResourceGroupID, '/')
@ -44,7 +44,7 @@ func (a *azureActions) ResourcesList(ctx context.Context, resources []mgmtfeatur
for _, resource := range armResources {
if hasWritten {
writer.Write(comaAsByteArray)
writer.Write(commaAsByteArray)
}
a.writeObject(writer, resource)
hasWritten = true
@ -61,7 +61,7 @@ func (a *azureActions) ResourcesList(ctx context.Context, resources []mgmtfeatur
}
if hasWritten {
writer.Write(comaAsByteArray)
writer.Write(commaAsByteArray)
}
hasWritten = true
@ -103,10 +103,11 @@ func (a *azureActions) writeObject(writer io.Writer, resource arm.Resource) {
if err != nil {
a.log.Warn(err) //very unlikely , only a handful of cases trigger an error
//here. and since we get the object from a database , it probably will never happen
}
_, err = writer.Write(bytes)
if err != nil {
a.log.Warn(err) //can happen if the the connection is closed for example
} else {
_, err = writer.Write(bytes)
if err != nil {
a.log.Warn(err) //can happen if the the connection is closed for example
}
}
}