Refactor out noop resource into a separate file

I still think it's a useful resource for demonstrating concepts and
perhaps for other future purposes.

noop.go

@@ -0,0 +1,124 @@
+// Mgmt
+// Copyright (C) 2013-2016+ James Shubin and the project contributors
+// Written by James Shubin <james@shubin.ca> and the project contributors
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package main
+
+import (
+	"log"
+)
+
+type NoopRes struct {
+	BaseRes `yaml:",inline"`
+	Comment string `yaml:"comment"` // extra field for example purposes
+}
+
+func NewNoopRes(name string) *NoopRes {
+	obj := &NoopRes{
+		BaseRes: BaseRes{
+			Name: name,
+		},
+		Comment: "",
+	}
+	obj.Init()
+	return obj
+}
+
+func (obj *NoopRes) Init() {
+	obj.BaseRes.kind = "Noop"
+	obj.BaseRes.Init() // call base init, b/c we're overriding
+}
+
+// validate if the params passed in are valid data
+// FIXME: where should this get called ?
+func (obj *NoopRes) Validate() bool {
+	return true
+}
+
+func (obj *NoopRes) Watch() {
+	if obj.IsWatching() {
+		return
+	}
+	obj.SetWatching(true)
+	defer obj.SetWatching(false)
+
+	//vertex := obj.vertex // stored with SetVertex
+	var send = false // send event?
+	var exit = false
+	for {
+		obj.SetState(resStateWatching) // reset
+		select {
+		case event := <-obj.events:
+			obj.SetConvergedState(resConvergedNil)
+			// we avoid sending events on unpause
+			if exit, send = obj.ReadEvent(&event); exit {
+				return // exit
+			}
+
+		case _ = <-TimeAfterOrBlock(obj.ctimeout):
+			obj.SetConvergedState(resConvergedTimeout)
+			obj.converged <- true
+			continue
+		}
+
+		// do all our event sending all together to avoid duplicate msgs
+		if send {
+			send = false
+			// only do this on certain types of events
+			//obj.isStateOK = false // something made state dirty
+			Process(obj) // XXX: rename this function
+		}
+	}
+}
+
+// CheckApply method for Noop resource. Does nothing, returns happy!
+func (obj *NoopRes) CheckApply(apply bool) (stateok bool, err error) {
+	log.Printf("%v[%v]: CheckApply(%t)", obj.Kind(), obj.GetName(), apply)
+	return true, nil // state is always okay
+}
+
+type NoopUUID struct {
+	BaseUUID
+	name string
+}
+
+func (obj *NoopRes) AutoEdges() AutoEdge {
+	return nil
+}
+
+// include all params to make a unique identification of this object
+// most resources only return one, although some resources return multiple
+func (obj *NoopRes) GetUUIDs() []ResUUID {
+	x := &NoopUUID{
+		BaseUUID: BaseUUID{name: obj.GetName(), kind: obj.Kind()},
+		name:     obj.Name,
+	}
+	return []ResUUID{x}
+}
+
+func (obj *NoopRes) Compare(res Res) bool {
+	switch res.(type) {
+	// we can only compare NoopRes to others of the same resource
+	case *NoopRes:
+		res := res.(*NoopRes)
+		if obj.Name != res.Name {
+			return false
+		}
+	default:
+		return false
+	}
+	return true
+}

resources.go

@@ -108,23 +108,6 @@ type BaseRes struct {
 	isStateOK      bool // whether the state is okay based on events or not
 }
 
-type NoopRes struct {
-	BaseRes `yaml:",inline"`
-	Comment string `yaml:"comment"` // extra field for example purposes
-}
-
-func NewNoopRes(name string) *NoopRes {
-	// FIXME: we could get rid of this New constructor and use raw object creation with a required Init()
-	obj := &NoopRes{
-		BaseRes: BaseRes{
-			Name: name,
-		},
-		Comment: "",
-	}
-	obj.Init()
-	return obj
-}
-
 // wraps the IFF method when used with a list of UUID's
 func UUIDExistsInUUIDs(uuid ResUUID, uuids []ResUUID) bool {
 	for _, u := range uuids {
@@ -411,89 +394,3 @@ func Process(obj Res) {
 		go obj.BackPoke()
 	}
 }
-
-func (obj *NoopRes) Init() {
-	obj.BaseRes.kind = "Noop"
-	obj.BaseRes.Init() // call base init, b/c we're overriding
-}
-
-// validate if the params passed in are valid data
-// FIXME: where should this get called ?
-func (obj *NoopRes) Validate() bool {
-	return true
-}
-
-func (obj *NoopRes) Watch() {
-	if obj.IsWatching() {
-		return
-	}
-	obj.SetWatching(true)
-	defer obj.SetWatching(false)
-
-	//vertex := obj.vertex // stored with SetVertex
-	var send = false // send event?
-	var exit = false
-	for {
-		obj.SetState(resStateWatching) // reset
-		select {
-		case event := <-obj.events:
-			obj.SetConvergedState(resConvergedNil)
-			// we avoid sending events on unpause
-			if exit, send = obj.ReadEvent(&event); exit {
-				return // exit
-			}
-
-		case _ = <-TimeAfterOrBlock(obj.ctimeout):
-			obj.SetConvergedState(resConvergedTimeout)
-			obj.converged <- true
-			continue
-		}
-
-		// do all our event sending all together to avoid duplicate msgs
-		if send {
-			send = false
-			// only do this on certain types of events
-			//obj.isStateOK = false // something made state dirty
-			Process(obj) // XXX: rename this function
-		}
-	}
-}
-
-// CheckApply method for Noop resource. Does nothing, returns happy!
-func (obj *NoopRes) CheckApply(apply bool) (stateok bool, err error) {
-	log.Printf("%v[%v]: CheckApply(%t)", obj.Kind(), obj.GetName(), apply)
-	return true, nil // state is always okay
-}
-
-type NoopUUID struct {
-	BaseUUID
-	name string
-}
-
-func (obj *NoopRes) AutoEdges() AutoEdge {
-	return nil
-}
-
-// include all params to make a unique identification of this object
-// most resources only return one, although some resources return multiple
-func (obj *NoopRes) GetUUIDs() []ResUUID {
-	x := &NoopUUID{
-		BaseUUID: BaseUUID{name: obj.GetName(), kind: obj.Kind()},
-		name:     obj.Name,
-	}
-	return []ResUUID{x}
-}
-
-func (obj *NoopRes) Compare(res Res) bool {
-	switch res.(type) {
-	// we can only compare NoopRes to others of the same resource
-	case *NoopRes:
-		res := res.(*NoopRes)
-		if obj.Name != res.Name {
-			return false
-		}
-	default:
-		return false
-	}
-	return true
-}