github-personal/incus-os
1
0
Fork 0
mirror of https://github.com/outbackdingo/incus-os.git synced 2026-01-28 02:19:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

incus-osd/rest: Rename API endpoint /1.0/system/storage/:import-encryption-key to /1.0/system/storage/:import-pool

Browse Source 
Signed-off-by: Mathias Gibbens <mathias.gibbens@futurfusion.io>
This commit is contained in:
Mathias Gibbens
2025-11-18 15:33:01 -07:00
parent 5bcec236f0
commit 98b94de7c7
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
incus-osd/internal/rest/api_system_storage.go
View File

@@ -263,11 +263,11 @@ func (*Server) apiSystemStorageWipeDrive(w http.ResponseWriter, r *http.Request)
_ = response.EmptySyncResponse.Render(w)
}
// swagger:operation POST /1.0/system/storage/:import-encryption-key system system_post_storage_import_encryption_key
// swagger:operation POST /1.0/system/storage/:import-pool system system_post_storage_import_pool
//
// Import an existing encryption key
// Import an existing encrypted storage pool
//
// Sets the encryption key when importing an existing storage pool.
// Imports an existing encrypted ZFS storage pool and save its encryption key.
//
// ---
// consumes:
@@ -277,7 +277,7 @@ func (*Server) apiSystemStorageWipeDrive(w http.ResponseWriter, r *http.Request)
// parameters:
// - in: body
// name: configuration
// description: Pool encryption information
// description: Existing pool information
// required: true
// schema:
// type: object
@@ -289,7 +289,7 @@ func (*Server) apiSystemStorageWipeDrive(w http.ResponseWriter, r *http.Request)
// $ref: "#/responses/BadRequest"
// "500":
// $ref: "#/responses/InternalServerError"
func (*Server) apiSystemStorageImportEncryptionKey(w http.ResponseWriter, r *http.Request) {
func (*Server) apiSystemStorageImportPool(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
if r.Method != http.MethodPost {
@@ -322,7 +322,7 @@ func (*Server) apiSystemStorageImportEncryptionKey(w http.ResponseWriter, r *htt
return
}
err = storage.SetEncryptionKey(r.Context(), poolStruct.Name, poolStruct.EncryptionKey)
err = zfs.ImportExistingPool(r.Context(), poolStruct.Name, poolStruct.EncryptionKey)
if err != nil {
_ = response.InternalError(err).Render(w)

2
incus-osd/internal/rest/server.go
View File

@@ -77,7 +77,7 @@ func (s *Server) Serve(ctx context.Context) error {
router.HandleFunc("/1.0/system/security/:tpm-rebind", s.apiSystemSecurityTPMRebind)
router.HandleFunc("/1.0/system/storage", s.apiSystemStorage)
router.HandleFunc("/1.0/system/storage/:delete-pool", s.apiSystemStorageDeletePool)
router.HandleFunc("/1.0/system/storage/:import-encryption-key", s.apiSystemStorageImportEncryptionKey)
router.HandleFunc("/1.0/system/storage/:import-pool", s.apiSystemStorageImportPool)
router.HandleFunc("/1.0/system/storage/:wipe-drive", s.apiSystemStorageWipeDrive)
router.HandleFunc("/1.0/system/update", s.apiSystemUpdate)
router.HandleFunc("/1.0/system/update/:check", s.apiSystemUpdateCheck)