1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00

chore(code): reduce divergence with EE EE-4344 (#7748)

This commit is contained in:
andres-portainer 2022-09-28 14:56:32 -03:00 committed by GitHub
parent e9384a6987
commit cb79dc18f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 259 additions and 180 deletions

View file

@ -119,9 +119,7 @@ func (handler *Handler) registryCreate(w http.ResponseWriter, r *http.Request) *
Ecr: payload.Ecr,
}
rs := handler.DataStore.Registry()
registries, err := rs.Registries()
registries, err := handler.DataStore.Registry().Registries()
if err != nil {
return httperror.InternalServerError("Unable to retrieve registries from the database", err)
}
@ -134,7 +132,7 @@ func (handler *Handler) registryCreate(w http.ResponseWriter, r *http.Request) *
}
}
err = rs.Create(registry)
err = handler.DataStore.Registry().Create(registry)
if err != nil {
return httperror.InternalServerError("Unable to persist the registry inside the database", err)
}

View file

@ -74,7 +74,7 @@ func delete_TestHandler_registryUpdate(t *testing.T) {
},
}
handler.Router.ServeHTTP(w, r)
handler.ServeHTTP(w, r)
assert.Equal(t, http.StatusOK, w.Code)
// Registry type should remain intact
assert.Equal(t, registry.Type, updatedRegistry.Type)
@ -85,5 +85,4 @@ func delete_TestHandler_registryUpdate(t *testing.T) {
assert.Equal(t, *payload.Authentication, updatedRegistry.Authentication)
assert.Equal(t, *payload.Username, updatedRegistry.Username)
assert.Equal(t, *payload.Password, updatedRegistry.Password)
}