vet: composite literal uses unkeyed fields

cmd/climc/shell/compute/scaling_policy.go

@@ -101,7 +101,7 @@ func init() {
 				ScalingGroup: args.ScalingGroup,
 				TriggerType:  args.TriggerType,
 				Timer: api.ScalingTimerCreateInput{
-					args.TimingExecTime,
+					ExecTime: args.TimingExecTime,
 				},
 				CycleTimer: api.ScalingCycleTimerCreateInput{
 					CycleType: args.CycleCycleType,

cmd/climc/shell/compute/servernetworks.go

@@ -155,7 +155,7 @@ func init() {
 		NETDESC []string `help:"Network description"`
 	}
 	R(&ServerAttachNetworkOptions{}, "server-attach-network", "Attach a server to a virtual network", func(s *mcclient.ClientSession, args *ServerAttachNetworkOptions) error {
-		input := compute.AttachNetworkInput{[]*compute.NetworkConfig{}}
+		input := compute.AttachNetworkInput{}
 		for i := 0; i < len(args.NETDESC); i++ {
 			conf, err := cmdline.ParseNetworkConfig(args.NETDESC[i], -1)
 			if err != nil {

pkg/apigateway/handler/resource.go

@@ -325,7 +325,10 @@ func (f *ResourceHandlers) listInContextsHandler(ctx context.Context, w http.Res
 	module3 := req.Mod3()
 	session := req.Session()
 	query := req.Query()
-	obj, e := module3.ListInContexts(session, query, []modulebase.ManagerContext{{module, req.ResID()}, {module2, req.ResID2()}})
+	obj, e := module3.ListInContexts(session, query, []modulebase.ManagerContext{
+		{InstanceManager: module, InstanceId: req.ResID()},
+		{InstanceManager: module2, InstanceId: req.ResID2()},
+	})
 	if e != nil {
 		httperrors.GeneralServerError(w, e)
 	} else {
@@ -659,7 +662,10 @@ func (f *ResourceHandlers) updateInContextsHandler(ctx context.Context, w http.R
 		return
 	}
 
-	obj, e := req.Mod3().PutInContexts(req.Session(), req.ResID3(), req.Body(), []modulebase.ManagerContext{{req.Mod1(), req.ResID()}, {req.Mod2(), req.ResID2()}})
+	obj, e := req.Mod3().PutInContexts(req.Session(), req.ResID3(), req.Body(), []modulebase.ManagerContext{
+		{InstanceManager: req.Mod1(), InstanceId: req.ResID()},
+		{InstanceManager: req.Mod2(), InstanceId: req.ResID2()},
+	})
 	if e != nil {
 		httperrors.GeneralServerError(w, e)
 	} else {
@@ -679,7 +685,10 @@ func (f *ResourceHandlers) patchInContextsHandler(ctx context.Context, w http.Re
 	session := req.Session()
 	body := req.Body()
 
-	obj, e := module3.PatchInContexts(session, req.ResID3(), body, []modulebase.ManagerContext{{module, req.ResID()}, {module2, req.ResID2()}})
+	obj, e := module3.PatchInContexts(session, req.ResID3(), body, []modulebase.ManagerContext{
+		{InstanceManager: module, InstanceId: req.ResID()},
+		{InstanceManager: module2, InstanceId: req.ResID2()},
+	})
 	if e != nil {
 		httperrors.GeneralServerError(w, e)
 	} else {
@@ -794,7 +803,10 @@ func (f *ResourceHandlers) deleteInContextsHandler(ctx context.Context, w http.R
 	query := req.Query()
 	body := req.Body()
 
-	obj, e := module3.DeleteInContextsWithParam(session, req.ResID3(), query, body, []modulebase.ManagerContext{{module, req.ResID()}, {module2, req.ResID2()}})
+	obj, e := module3.DeleteInContextsWithParam(session, req.ResID3(), query, body, []modulebase.ManagerContext{
+		{InstanceManager: module, InstanceId: req.ResID()},
+		{InstanceManager: module2, InstanceId: req.ResID2()},
+	})
 	if e != nil {
 		httperrors.GeneralServerError(w, e)
 	} else {

pkg/compute/models/snapshotpolicycache.go

@@ -69,8 +69,12 @@ func init() {
 func NewSSnapshotPolicyCache(snapshotpolicyId, cloudregionId, externalId string) *SSnapshotPolicyCache {
 	cache := SSnapshotPolicyCache{
 		// SnapshotpolicyId:          snapshotpolicyId,
-		SCloudregionResourceBase:  SCloudregionResourceBase{cloudregionId},
-		SExternalizedResourceBase: db.SExternalizedResourceBase{externalId},
+		SCloudregionResourceBase: SCloudregionResourceBase{
+			CloudregionId: cloudregionId,
+		},
+		SExternalizedResourceBase: db.SExternalizedResourceBase{
+			ExternalId: externalId,
+		},
 	}
 	cache.SnapshotpolicyId = snapshotpolicyId
 	cache.SetModelManager(SnapshotPolicyCacheManager, &cache)

pkg/esxi/handler/handlers.go

@@ -128,7 +128,10 @@ func savePrepareHandler(ctx context.Context, w http.ResponseWriter, r *http.Requ
 		httperrors.GeneralServerError(w, err)
 		return
 	}
-	hostutils.DelayTask(ctx, disk.PrepareSaveToGlance, storageman.PrepareSaveToGlanceParams{taskId, diskInfo})
+	hostutils.DelayTask(ctx, disk.PrepareSaveToGlance, storageman.PrepareSaveToGlanceParams{
+		TaskId:   taskId,
+		DiskInfo: diskInfo,
+	})
 	hostutils.ResponseOk(ctx, w)
 }
 

pkg/hostman/guestman/guesthandlers/guesthandler.go

@@ -136,7 +136,11 @@ func guestCreate(ctx context.Context, sid string, body jsonutils.JSONObject) (in
 	}
 	hostutils.DelayTaskWithWorker(ctx,
 		guestman.GetGuestManager().GuestCreate,
-		&guestman.SGuestDeploy{sid, body, true},
+		&guestman.SGuestDeploy{
+			Sid:    sid,
+			Body:   body,
+			IsInit: true,
+		},
 		guestman.NbdWorker,
 	)
 	return nil, nil
@@ -149,7 +153,11 @@ func guestDeploy(ctx context.Context, sid string, body jsonutils.JSONObject) (in
 	}
 	hostutils.DelayTaskWithWorker(ctx,
 		guestman.GetGuestManager().GuestDeploy,
-		&guestman.SGuestDeploy{sid, body, false},
+		&guestman.SGuestDeploy{
+			Sid:    sid,
+			Body:   body,
+			IsInit: false,
+		},
 		guestman.NbdWorker,
 	)
 	return nil, nil
@@ -196,7 +204,10 @@ func guestSync(ctx context.Context, sid string, body jsonutils.JSONObject) (inte
 	if !guestman.GetGuestManager().IsGuestExist(sid) {
 		return nil, httperrors.NewNotFoundError("Guest %s not found", sid)
 	}
-	hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestSync, &guestman.SBaseParms{sid, body})
+	hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestSync, &guestman.SBaseParms{
+		Sid:  sid,
+		Body: body,
+	})
 	return nil, nil
 }
 
@@ -224,7 +235,11 @@ func guestIoThrottle(ctx context.Context, sid string, body jsonutils.JSONObject)
 	if err != nil {
 		return nil, httperrors.NewMissingParameterError("iops")
 	}
-	hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().GuestIoThrottle, &guestman.SGuestIoThrottle{sid, bps, iops})
+	hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().GuestIoThrottle, &guestman.SGuestIoThrottle{
+		Sid:  sid,
+		BPS:  bps,
+		IOPS: iops,
+	})
 	return nil, nil
 }
 
@@ -234,7 +249,10 @@ func guestSrcPrepareMigrate(ctx context.Context, sid string, body jsonutils.JSON
 	}
 	liveMigrate := jsonutils.QueryBoolean(body, "live_migrate", false)
 	hostutils.DelayTask(ctx, guestman.GetGuestManager().SrcPrepareMigrate,
-		&guestman.SSrcPrepareMigrate{sid, liveMigrate})
+		&guestman.SSrcPrepareMigrate{
+			Sid:         sid,
+			LiveMigrate: liveMigrate,
+		})
 	return nil, nil
 }
 
@@ -359,7 +377,11 @@ func guestDriveMirror(ctx context.Context, sid string, body jsonutils.JSONObject
 		return nil, httperrors.NewMissingParameterError("desc")
 	}
 	hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().StartDriveMirror,
-		&guestman.SDriverMirror{sid, backupNbdServerUri, desc})
+		&guestman.SDriverMirror{
+			Sid:          sid,
+			NbdServerUri: backupNbdServerUri,
+			Desc:         desc,
+		})
 	return nil, nil
 }
 
@@ -383,7 +405,11 @@ func guestHotplugCpuMem(ctx context.Context, sid string, body jsonutils.JSONObje
 	addCpuCount, _ := body.Int("add_cpu")
 	addMemSize, _ := body.Int("add_mem")
 	hostutils.DelayTaskWithoutReqctx(ctx, guestman.GetGuestManager().HotplugCpuMem,
-		&guestman.SGuestHotplugCpuMem{sid, addCpuCount, addMemSize})
+		&guestman.SGuestHotplugCpuMem{
+			Sid:         sid,
+			AddCpuCount: addCpuCount,
+			AddMemSize:  addMemSize,
+		})
 	return nil, nil
 }
 
@@ -411,7 +437,10 @@ func guestReloadDiskSnapshot(ctx context.Context, sid string, body jsonutils.JSO
 		return nil, httperrors.NewNotFoundError("Disk not found")
 	}
 
-	hostutils.DelayTask(ctx, guestman.GetGuestManager().ReloadDiskSnapshot, &guestman.SReloadDisk{sid, disk})
+	hostutils.DelayTask(ctx, guestman.GetGuestManager().ReloadDiskSnapshot, &guestman.SReloadDisk{
+		Sid:  sid,
+		Disk: disk,
+	})
 	return nil, nil
 }
 
@@ -443,7 +472,11 @@ func guestSnapshot(ctx context.Context, sid string, body jsonutils.JSONObject) (
 		return nil, httperrors.NewNotFoundError("Disk not found")
 	}
 
-	hostutils.DelayTask(ctx, guestman.GetGuestManager().DoSnapshot, &guestman.SDiskSnapshot{sid, snapshotId, disk})
+	hostutils.DelayTask(ctx, guestman.GetGuestManager().DoSnapshot, &guestman.SDiskSnapshot{
+		Sid:        sid,
+		SnapshotId: snapshotId,
+		Disk:       disk,
+	})
 	return nil, nil
 }
 

pkg/hostman/guestman/guesthandlers/guestimport.go

@@ -94,7 +94,12 @@ func guestCreateFromLibvirt(ctx context.Context, sid string, body jsonutils.JSON
 	}
 
 	hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestCreateFromLibvirt,
-		&guestman.SGuestCreateFromLibvirt{sid, monitorPath, guestDesc, disksPath})
+		&guestman.SGuestCreateFromLibvirt{
+			Sid:         sid,
+			MonitorPath: monitorPath,
+			GuestDesc:   guestDesc,
+			DisksPath:   disksPath,
+		})
 	return nil, nil
 }
 
@@ -118,6 +123,10 @@ func guestCreateFromEsxi(ctx context.Context, sid string, body jsonutils.JSONObj
 		return nil, httperrors.NewMissingParameterError("esxi_access_info")
 	}
 	hostutils.DelayTask(ctx, guestman.GetGuestManager().GuestCreateFromEsxi,
-		&guestman.SGuestCreateFromEsxi{sid, guestDesc, disksAccessInfo})
+		&guestman.SGuestCreateFromEsxi{
+			Sid:            sid,
+			GuestDesc:      guestDesc,
+			EsxiAccessInfo: disksAccessInfo,
+		})
 	return nil, nil
 }

pkg/hostman/storageman/diskhandlers/diskhandler.go

@@ -242,7 +242,12 @@ func diskCreate(ctx context.Context, storage storageman.IStorage, diskId string,
 		return nil, httperrors.NewMissingParameterError("disk")
 	}
 	hostutils.DelayTask(ctx, storage.CreateDiskByDiskinfo,
-		&storageman.SDiskCreateByDiskinfo{diskId, disk, diskInfo, storage})
+		&storageman.SDiskCreateByDiskinfo{
+			DiskId:   diskId,
+			Disk:     disk,
+			DiskInfo: diskInfo,
+			Storage:  storage,
+		})
 	return nil, nil
 }
 
@@ -284,7 +289,10 @@ func diskReset(ctx context.Context, storage storageman.IStorage, diskId string,
 	if err != nil {
 		return nil, httperrors.NewMissingParameterError("snapshot_id")
 	}
-	hostutils.DelayTask(ctx, disk.ResetFromSnapshot, &storageman.SDiskReset{snapshotId, body})
+	hostutils.DelayTask(ctx, disk.ResetFromSnapshot, &storageman.SDiskReset{
+		SnapshotId: snapshotId,
+		Input:      body,
+	})
 	return nil, nil
 }
 
@@ -315,6 +323,9 @@ func diskCleanupSnapshots(ctx context.Context, storage storageman.IStorage, disk
 	if err != nil {
 		return nil, httperrors.NewMissingParameterError("delete_snapshots")
 	}
-	hostutils.DelayTask(ctx, disk.CleanupSnapshots, &storageman.SDiskCleanupSnapshots{convertSnapshots, deleteSnapshots})
+	hostutils.DelayTask(ctx, disk.CleanupSnapshots, &storageman.SDiskCleanupSnapshots{
+		ConvertSnapshots: convertSnapshots,
+		DeleteSnapshots:  deleteSnapshots,
+	})
 	return nil, nil
 }

pkg/logger/models/actionlog.go

@@ -57,7 +57,11 @@ var logQueue = make(chan *SActionlog, 50)
 
 func init() {
 	InitActionWhiteList()
-	ActionLog = &SActionlogManager{db.SOpsLogManager{db.NewModelBaseManager(SActionlog{}, "action_tbl", "action", "actions")}}
+	ActionLog = &SActionlogManager{
+		SOpsLogManager: db.SOpsLogManager{
+			SModelBaseManager: db.NewModelBaseManager(SActionlog{}, "action_tbl", "action", "actions"),
+		},
+	}
 	ActionLog.SetVirtualObject(ActionLog)
 }
 

pkg/mcclient/modules/mod_projects.go

@@ -36,12 +36,18 @@ var (
 
 func (this *ProjectManagerV3) _join(s *mcclient.ClientSession, pid, uid, rid, resource string) error {
 	if resource == "users" {
-		_, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, uid}})
+		_, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{
+			{InstanceManager: &Projects, InstanceId: pid},
+			{InstanceManager: &UsersV3, InstanceId: uid},
+		})
 		if err != nil {
 			return err
 		}
 	} else if resource == "groups" {
-		_, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&Groups, uid}})
+		_, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{
+			{InstanceManager: &Projects, InstanceId: pid},
+			{InstanceManager: &Groups, InstanceId: uid},
+		})
 		if err != nil {
 			return err
 		}
@@ -52,9 +58,15 @@ func (this *ProjectManagerV3) _join(s *mcclient.ClientSession, pid, uid, rid, re
 func (this *ProjectManagerV3) _leave(s *mcclient.ClientSession, pid string, resource string, uid string, rid string) error {
 	var err error
 	if resource == "users" {
-		_, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, uid}})
+		_, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{
+			{InstanceManager: &Projects, InstanceId: pid},
+			{InstanceManager: &UsersV3, InstanceId: uid},
+		})
 	} else if resource == "groups" {
-		_, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&Groups, uid}})
+		_, err = RolesV3.DeleteInContexts(s, rid, nil, []modulebase.ManagerContext{
+			{InstanceManager: &Projects, InstanceId: pid},
+			{InstanceManager: &Groups, InstanceId: uid},
+		})
 	}
 	if err != nil {
 		return err
@@ -194,9 +206,9 @@ func (this *ProjectManagerV3) DoProjectBatchJoin(s *mcclient.ClientSession, para
 					rid,
 					nil,
 					[]modulebase.ManagerContext{
-						{&Projects,
-							pid},
-						{&UsersV3, id}})
+						{InstanceManager: &Projects, InstanceId: pid},
+						{InstanceManager: &UsersV3, InstanceId: id},
+					})
 				if err != nil {
 					return nil, err
 				}
@@ -206,9 +218,9 @@ func (this *ProjectManagerV3) DoProjectBatchJoin(s *mcclient.ClientSession, para
 					rid,
 					nil,
 					[]modulebase.ManagerContext{
-						{&Projects,
-							pid},
-						{&Groups, id}})
+						{InstanceManager: &Projects, InstanceId: pid},
+						{InstanceManager: &Groups, InstanceId: id},
+					})
 				if err != nil {
 					return nil, err
 				}
@@ -243,12 +255,18 @@ func (this *ProjectManagerV3) DoProjectBatchDeleteUserGroup(s *mcclient.ClientSe
 		res_type, _ := item.GetString("res_type")
 
 		if res_type == "user" {
-			_, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, id}})
+			_, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{
+				{InstanceManager: &Projects, InstanceId: pid},
+				{InstanceManager: &UsersV3, InstanceId: id},
+			})
 			if err != nil {
 				return nil, err
 			}
 		} else if res_type == "group" {
-			_, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{{&Projects, pid}, {&Groups, id}})
+			_, err := RolesV3.DeleteInContexts(s, role_id, nil, []modulebase.ManagerContext{
+				{InstanceManager: &Projects, InstanceId: pid},
+				{InstanceManager: &Groups, InstanceId: id},
+			})
 			if err != nil {
 				return nil, err
 			}
@@ -282,7 +300,10 @@ func (this *ProjectManagerV3) FetchId(s *mcclient.ClientSession, project string,
 }
 
 func (this *ProjectManagerV3) JoinProject(s *mcclient.ClientSession, rid, pid, uid string) error {
-	_, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{{&Projects, pid}, {&UsersV3, uid}})
+	_, err := RolesV3.PutInContexts(s, rid, nil, []modulebase.ManagerContext{
+		{InstanceManager: &Projects, InstanceId: pid},
+		{InstanceManager: &UsersV3, InstanceId: uid},
+	})
 	if err != nil {
 		return err
 	}