diff --git a/apiserver/facades/agent/uniter/uniter.go b/apiserver/facades/agent/uniter/uniter.go index 2faee21b8e1..e99478e61e3 100644 --- a/apiserver/facades/agent/uniter/uniter.go +++ b/apiserver/facades/agent/uniter/uniter.go @@ -1078,7 +1078,7 @@ func (u *UniterAPI) RelationsStatus(ctx context.Context, args params.Entities) ( return result, nil } -// Life returns the life status of the specified units. +// Life returns the life status of the specified applications or units. func (u *UniterAPI) Life(ctx context.Context, args params.Entities) (params.LifeResults, error) { result := params.LifeResults{ Results: make([]params.LifeResult, len(args.Entities)), diff --git a/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go b/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go index fedd8925499..22e7b31525f 100644 --- a/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go +++ b/apiserver/facades/controller/caasapplicationprovisioner/provisioner.go @@ -918,7 +918,6 @@ func (a *API) UpdateApplicationsUnits(ctx context.Context, args params.UpdateApp result.Results[i].Error = apiservererrors.ServerError(err) continue } - // app, err := a.state.Application(appTag.Id()) if err != nil { result.Results[i].Error = apiservererrors.ServerError(err) diff --git a/apiserver/facades/controller/caasfirewaller/firewaller.go b/apiserver/facades/controller/caasfirewaller/firewaller.go index 7d60a71e5ec..20c0b6224c4 100644 --- a/apiserver/facades/controller/caasfirewaller/firewaller.go +++ b/apiserver/facades/controller/caasfirewaller/firewaller.go @@ -152,7 +152,7 @@ func NewFacade( }, nil } -// Life returns the life status of the specified units. +// Life returns the life status of the specified applications or units. func (f *Facade) Life(ctx context.Context, args params.Entities) (params.LifeResults, error) { result := params.LifeResults{ Results: make([]params.LifeResult, len(args.Entities)), diff --git a/apiserver/facades/schema.json b/apiserver/facades/schema.json index 4715183b2c4..196b7c28d39 100644 --- a/apiserver/facades/schema.json +++ b/apiserver/facades/schema.json @@ -8204,7 +8204,7 @@ "$ref": "#/definitions/LifeResults" } }, - "description": "Life returns the life status of the specified units." + "description": "Life returns the life status of the specified applications or units." }, "Watch": { "type": "object", @@ -39658,7 +39658,7 @@ "$ref": "#/definitions/LifeResults" } }, - "description": "Life returns the life status of the specified units." + "description": "Life returns the life status of the specified applications or units." }, "LogActionsMessages": { "type": "object", diff --git a/domain/life/life.go b/domain/life/life.go index c22922e6eed..079b0f32d07 100644 --- a/domain/life/life.go +++ b/domain/life/life.go @@ -26,5 +26,5 @@ func (l Life) Value() corelife.Value { case Dead: return corelife.Dead } - return corelife.Alive + return "" }