Storage: Fix some incorrect operation entity URLs for storage volumes and buckets (#18139)

Author: tomponline

lxd/storage_buckets.go

@@ -672,7 +672,7 @@ func storagePoolBucketPut(d *Daemon, r *http.Request) response.Response {
 		location = request.QueryParam(r, "target")
 	}
 
-	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName)
+	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName).Project(effectiveProjectName)
 
 	run := func(ctx context.Context, op *operations.Operation) error {
 		err := details.pool.UpdateBucket(effectiveProjectName, details.bucketName, req)
@@ -754,7 +754,7 @@ func storagePoolBucketDelete(d *Daemon, r *http.Request) response.Response {
 		location = request.QueryParam(r, "target")
 	}
 
-	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName)
+	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName).Project(effectiveProjectName)
 
 	run := func(ctx context.Context, op *operations.Operation) error {
 		err := doStorageBucketDelete(details.pool, effectiveProjectName, details.bucketName)
@@ -1015,7 +1015,7 @@ func storagePoolBucketKeysPost(d *Daemon, r *http.Request) response.Response {
 		location = request.QueryParam(r, "target")
 	}
 
-	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName)
+	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName).Project(effectiveProjectName)
 
 	run := func(ctx context.Context, op *operations.Operation) error {
 		key, err := details.pool.CreateBucketKey(effectiveProjectName, details.bucketName, req)
@@ -1107,7 +1107,7 @@ func storagePoolBucketKeyDelete(d *Daemon, r *http.Request) response.Response {
 		location = request.QueryParam(r, "target")
 	}
 
-	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName)
+	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName).Project(effectiveProjectName)
 
 	run := func(ctx context.Context, op *operations.Operation) error {
 		err := details.pool.DeleteBucketKey(effectiveProjectName, details.bucketName, keyName)
@@ -1303,7 +1303,7 @@ func storagePoolBucketKeyPut(d *Daemon, r *http.Request) response.Response {
 		location = request.QueryParam(r, "target")
 	}
 
-	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName)
+	entityURL := entity.StorageBucketURL(effectiveProjectName, location, details.pool.Name(), details.bucketName).Project(effectiveProjectName)
 
 	run := func(ctx context.Context, op *operations.Operation) error {
 		err := details.pool.UpdateBucketKey(effectiveProjectName, details.bucketName, keyName, req)

lxd/storage_volumes.go

@@ -1312,10 +1312,10 @@ func doVolumeCreateOrCopy(s *state.State, r *http.Request, requestProjectName st
 		if shared.IsSnapshot(req.Source.Name) {
 			opType = operationtype.VolumeSnapshotCopy
 			vName, sName, _ := api.GetParentAndSnapshotName(req.Source.Name)
-			entityURL = entity.StorageVolumeSnapshotURL(srcProjectName, location, req.Source.Pool, req.Type, vName, sName)
+			entityURL = entity.StorageVolumeSnapshotURL(srcProjectName, location, req.Source.Pool, req.Type, vName, sName).Project(projectName)
 		} else {
 			opType = operationtype.VolumeCopy
-			entityURL = entity.StorageVolumeURL(srcProjectName, location, req.Source.Pool, req.Type, req.Source.Name)
+			entityURL = entity.StorageVolumeURL(srcProjectName, location, req.Source.Pool, req.Type, req.Source.Name).Project(projectName)
 		}
 
 		run = func(ctx context.Context, op *operations.Operation) error {
@@ -1881,10 +1881,10 @@ func storagePoolVolumeTypePostMigration(state *state.State, r *http.Request, req
 	srcVolParentName, srcVolSnapName, srcIsSnapshot := api.GetParentAndSnapshotName(volumeName)
 	if srcIsSnapshot {
 		opType = operationtype.VolumeSnapshotTransfer
-		entityURL = api.NewURL().Path(version.APIVersion, "storage-pools", poolName, "volumes", "custom", srcVolParentName, "snapshots", srcVolSnapName)
+		entityURL = api.NewURL().Path(version.APIVersion, "storage-pools", poolName, "volumes", "custom", srcVolParentName, "snapshots", srcVolSnapName).Project(projectName)
 	} else {
 		opType = operationtype.VolumeMigrate
-		entityURL = api.NewURL().Path(version.APIVersion, "storage-pools", poolName, "volumes", "custom", volumeName)
+		entityURL = api.NewURL().Path(version.APIVersion, "storage-pools", poolName, "volumes", "custom", volumeName).Project(projectName)
 	}
 
 	// We're migrating volume on this node.