Merge pull request #53 from whywaita/fix/49

ListTarget do not return target that can not receive job

pkg/datastore/interface.go

@@ -81,6 +81,24 @@ func (t *Target) CanReceiveJob() bool {
 	return true
 }
 
+// ListTargets get list of target that can receive job
+func ListTargets(ctx context.Context, ds Datastore) ([]Target, error) {
+	targets, err := ds.ListTargets(ctx)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get targets from datastore: %w", err)
+	}
+
+	var result []Target
+
+	for _, t := range targets {
+		if t.CanReceiveJob() {
+			result = append(result, t)
+		}
+	}
+
+	return result, nil
+}
+
 // UpdateTargetStatus update datastore
 func UpdateTargetStatus(ctx context.Context, ds Datastore, targetID uuid.UUID, newStatus TargetStatus, description string) error {
 	target, err := ds.GetTarget(ctx, targetID)

pkg/runner/runner.go

@@ -66,7 +66,7 @@ func (m *Manager) Loop(ctx context.Context) error {
 func (m *Manager) do(ctx context.Context) error {
 	logger.Logf(true, "start runner manager")
 
-	targets, err := m.ds.ListTargets(ctx)
+	targets, err := datastore.ListTargets(ctx, m.ds)
 	if err != nil {
 		return fmt.Errorf("failed to get targets: %w", err)
 	}
@@ -86,7 +86,7 @@ func (m *Manager) do(ctx context.Context) error {
 func (m *Manager) permissionCheck(ctx context.Context) error {
 	logger.Logf(true, "start checking initialize state")
 
-	targets, err := m.ds.ListTargets(ctx)
+	targets, err := datastore.ListTargets(ctx, m.ds)
 	if err != nil {
 		return fmt.Errorf("failed to get targets: %w", err)
 	}

pkg/web/target.go

@@ -91,7 +91,7 @@ func (t *targetCreateParam) toDS() datastore.Target {
 func handleTargetList(w http.ResponseWriter, r *http.Request, ds datastore.Datastore) {
 	ctx := r.Context()
 
-	ts, err := ds.ListTargets(ctx)
+	ts, err := datastore.ListTargets(ctx, ds)
 	if err != nil {
 		logger.Logf(false, "failed to retrieve list of target: %+v", err)
 		outputErrorMsg(w, http.StatusInternalServerError, "datastore read error")