config: Allow configuring from another ModuleConfig instance.

Author: brectanus-sigsci

config.go

@@ -334,3 +334,10 @@ func ServerIdentifier(id string) ModuleConfigOption {
 		return nil
 	}
 }
+
+func FromModuleConfig(mcfg *ModuleConfig) ModuleConfigOption {
+	return func(c *ModuleConfig) error {
+		*c = *mcfg
+		return nil
+	}
+}

config_test.go

@@ -6,8 +6,7 @@ import (
 	"time"
 )
 
-func TestModuleConfig(t *testing.T) {
-	// Everything default
+func TestDefaultModuleConfig(t *testing.T) {
 	c, err := NewModuleConfig()
 	if err != nil {
 		t.Fatalf("Failed to create module config: %s", err)
@@ -75,9 +74,92 @@ func TestModuleConfig(t *testing.T) {
 	if c.IsBlockCode(200) {
 		t.Errorf("Unexpected IsBlockCode(200): %v", c.IsBlockCode(200))
 	}
+}
+
+func TestConfiguredModuleConfig(t *testing.T) {
+	c, err := NewModuleConfig(
+		AllowUnknownContentLength(true),
+		AltResponseCodes(403),
+		AnomalyDuration(10*time.Second),
+		AnomalySize(8192),
+		CustomInspector(&RPCInspector{}, func(_ *http.Request) bool { return true }, func(_ *http.Request) {}),
+		CustomHeaderExtractor(func(_ *http.Request) (http.Header, error) { return nil, nil }),
+		Debug(true),
+		MaxContentLength(500000),
+		Socket("tcp", "0.0.0.0:1234"),
+		Timeout(10*time.Millisecond),
+	)
+	if err != nil {
+		t.Fatalf("Failed to create module config: %s", err)
+	}
+	if c.AllowUnknownContentLength() != true {
+		t.Errorf("Unexpected AllowUnknownContentLength: %v", c.AllowUnknownContentLength())
+	}
+	altResponseCodes := c.AltResponseCodes()
+	if len(altResponseCodes) != 1 || altResponseCodes[0] != 403 {
+		t.Errorf("Unexpected AltResponseCodes: %v", altResponseCodes)
+	}
+	if c.AnomalyDuration() != 10*time.Second {
+		t.Errorf("Unexpected AnomalyDuration: %v", c.AnomalyDuration())
+	}
+	if c.AnomalySize() != 8192 {
+		t.Errorf("Unexpected AnomalySize: %v", c.AnomalySize())
+	}
+	if c.Debug() != true {
+		t.Errorf("Unexpected Debug: %v", c.Debug())
+	}
+	if c.HeaderExtractor() == nil {
+		t.Errorf("Unexpected HeaderExtractor: %p", c.HeaderExtractor())
+	}
+	if c.Inspector() == DefaultInspector {
+		t.Errorf("Unexpected Inspector: %v", c.Inspector())
+	}
+	if c.InspectorInit() == nil {
+		t.Errorf("Unexpected InspectorInit: %p", c.InspectorInit())
+	}
+	if c.InspectorFini() == nil {
+		t.Errorf("Unexpected InspectorFini: %p", c.InspectorFini())
+	}
+	if c.MaxContentLength() != 500000 {
+		t.Errorf("Unexpected MaxContentLength: %v", c.MaxContentLength())
+	}
+	if c.ModuleIdentifier() != DefaultModuleIdentifier {
+		t.Errorf("Unexpected ModuleIdentifier: %v", c.ModuleIdentifier())
+	}
+	if c.RPCAddress() != "0.0.0.0:1234" {
+		t.Errorf("Unexpected RPCAddress: %v", c.RPCAddress())
+	}
+	if c.RPCNetwork() != "tcp" {
+		t.Errorf("Unexpected RPCNetwork: %v", c.RPCNetwork())
+	}
+	if c.RPCAddressString() != "tcp:0.0.0.0:1234" {
+		t.Errorf("Unexpected RPCAddressString: %v", c.RPCAddressString())
+	}
+	if c.ServerIdentifier() != DefaultServerIdentifier {
+		t.Errorf("Unexpected ServerIdentifier: %v", c.ServerIdentifier())
+	}
+	if c.Timeout() != 10*time.Millisecond {
+		t.Errorf("Unexpected Timeout: %v", c.Timeout())
+	}
+	if c.IsAllowCode(406) {
+		t.Errorf("Unexpected IsAllowCode(406): %v", c.IsAllowCode(406))
+	}
+	if !c.IsAllowCode(200) {
+		t.Errorf("Unexpected IsAllowCode(200): %v", c.IsAllowCode(200))
+	}
+	if !c.IsBlockCode(406) {
+		t.Errorf("Unexpected IsBlockCode(406): %v", c.IsBlockCode(406))
+	}
+	if !c.IsBlockCode(403) {
+		t.Errorf("Unexpected IsBlockCode(403): %v", c.IsBlockCode(403))
+	}
+	if c.IsBlockCode(200) {
+		t.Errorf("Unexpected IsBlockCode(200): %v", c.IsBlockCode(200))
+	}
+}
 
-	// Everything configured non-default
-	c, err = NewModuleConfig(
+func TestFromModuleConfig(t *testing.T) {
+	c0, err := NewModuleConfig(
 		AllowUnknownContentLength(true),
 		AltResponseCodes(403),
 		AnomalyDuration(10*time.Second),
@@ -92,6 +174,13 @@ func TestModuleConfig(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Failed to create module config: %s", err)
 	}
+
+	c, err := NewModuleConfig(
+		FromModuleConfig(c0),
+	)
+	if err != nil {
+		t.Fatalf("Failed to create module config: %s", err)
+	}
 	if c.AllowUnknownContentLength() != true {
 		t.Errorf("Unexpected AllowUnknownContentLength: %v", c.AllowUnknownContentLength())
 	}