Merge lp:~mfoord/juju-core/ha-rsyslog-2 into lp:~go-bot/juju-core/trunk

[Michael Foord]

[lp:~mfoord/juju-core/ha-rsyslog-2]

2732. By Michael Foord on 2014-05-22

Test fix

2733. By Michael Foord on 2014-05-22

Remove AuthAgent

2734. By Michael Foord on 2014-05-22

Bulkify GetRsyslogConfig

2735. By Michael Foord on 2014-05-22

Switch to correct Error type

2736. By Michael Foord on 2014-05-22

Merge

2737. By Michael Foord on 2014-05-22

Merge back to good revision

2738. By Michael Foord on 2014-05-22

Merge shortcut removal again

2739. By Michael Foord on 2014-05-22

Merge again

[Michael Foord (mfoord)]

Done as part of: https://code.launchpad.net/~mfoord/juju-core/ha-rsyslog-good/+merge/220669

Unmerged revisions

2739. By Michael Foord on 2014-05-22

Merge again

2738. By Michael Foord on 2014-05-22

Merge shortcut removal again

2737. By Michael Foord on 2014-05-22

Merge back to good revision

2736. By Michael Foord on 2014-05-22

Merge

2735. By Michael Foord on 2014-05-22

Switch to correct Error type

2734. By Michael Foord on 2014-05-22

Bulkify GetRsyslogConfig

2733. By Michael Foord on 2014-05-22

Remove AuthAgent

2732. By Michael Foord on 2014-05-22

Test fix

2731. By Michael Foord on 2014-05-22

Use AuthAgent

2730. By Michael Foord on 2014-05-22

Add AuthAgent to Authorizer

=== modified file 'state/api/params/params.go'
--- state/api/params/params.go	2014-05-22 14:34:54 +0000
+++ state/api/params/params.go	2014-05-22 14:34:54 +0000
@@ -683,11 +683,20 @@
 
 // RsyslogConfigResult holds the result of a GetRsyslogConfig call.
 type RsyslogConfigResult struct {
-	CACert    string
+	Error  *Error
+	CACert string
+	// Port is only used by state servers as the port to listen on.
+	// Clients should use HostPorts for the rsyslog addresses to forward
+	// logs to.
 	Port      int
 	HostPorts []instance.HostPort
 }
 
+// RsyslogConfigResults is the bulk form of RyslogConfigResult
+type RsyslogConfigResults struct {
+	Results []RsyslogConfigResult
+}
+
 // DistributionGroupResult contains the result of
 // the DistributionGroup provisioner API call.
 type DistributionGroupResult struct {

=== modified file 'state/api/rsyslog/rsyslog.go'
--- state/api/rsyslog/rsyslog.go	2014-05-22 14:34:54 +0000
+++ state/api/rsyslog/rsyslog.go	2014-05-22 14:34:54 +0000
@@ -16,7 +16,8 @@
 
 // RsyslogConfig holds the values needed for the rsyslog worker
 type RsyslogConfig struct {
-	CACert    string
+	CACert string
+	// Port is only used by state servers as the port to listen on.
 	Port      int
 	HostPorts []instance.HostPort
 }
@@ -75,12 +76,20 @@
 }
 
 // GetRsyslogConfig returns a RsyslogConfig.
-func (st *State) GetRsyslogConfig() (*RsyslogConfig, error) {
-	var result params.RsyslogConfigResult
-	err := st.caller.Call(rsyslogAPI, "", "GetRsyslogConfig", nil, &result)
+func (st *State) GetRsyslogConfig(agentTag string) (*RsyslogConfig, error) {
+	var results params.RsyslogConfigResults
+	args := params.Entities{
+		Entities: []params.Entity{{Tag: agentTag}},
+	}
+	err := st.caller.Call(rsyslogAPI, "", "GetRsyslogConfig", args, &results)
 	if err != nil {
 		return nil, err
 	}
+	result := results.Results[0]
+	if result.Error != nil {
+		//  TODO: Not directly tested
+		return nil, result.Error
+	}
 	return &RsyslogConfig{
 		CACert:    result.CACert,
 		Port:      result.Port,

=== modified file 'state/api/rsyslog/rsyslog_test.go'
--- state/api/rsyslog/rsyslog_test.go	2014-05-22 14:34:54 +0000
+++ state/api/rsyslog/rsyslog_test.go	2014-05-22 14:34:54 +0000
@@ -41,7 +41,7 @@
 	err := s.APIState.Client().EnvironmentSet(map[string]interface{}{"rsyslog-ca-cert": coretesting.CACert})
 	c.Assert(err, gc.IsNil)
 
-	cfg, err := s.rsyslog.GetRsyslogConfig()
+	cfg, err := s.rsyslog.GetRsyslogConfig(s.machine.Tag())
 	c.Assert(err, gc.IsNil)
 	c.Assert(cfg, gc.NotNil)
 

=== modified file 'state/apiserver/common/interfaces.go'
--- state/apiserver/common/interfaces.go	2014-01-22 19:28:08 +0000
+++ state/apiserver/common/interfaces.go	2014-05-22 14:34:54 +0000
@@ -45,7 +45,7 @@
 	GetAuthEntity() state.Entity
 }
 
-// AuthEither returns an AuthFunc generator that returns and AuthFunc
+// AuthEither returns an AuthFunc generator that returns an AuthFunc
 // that accepts any tag authorized by either of its arguments.
 func AuthEither(a, b GetAuthFunc) GetAuthFunc {
 	return func() (AuthFunc, error) {

=== modified file 'state/apiserver/rsyslog/rsyslog.go'
--- state/apiserver/rsyslog/rsyslog.go	2014-05-22 14:34:54 +0000
+++ state/apiserver/rsyslog/rsyslog.go	2014-05-22 14:34:54 +0000
@@ -60,22 +60,27 @@
 }
 
 // GetRsyslogConfig returns a RsyslogConfigResult.
-func (api *RsyslogAPI) GetRsyslogConfig() (params.RsyslogConfigResult, error) {
+func (api *RsyslogAPI) GetRsyslogConfig(args params.Entities) (params.RsyslogConfigResults, error) {
+	result := params.RsyslogConfigResults{
+		Results: make([]params.RsyslogConfigResult, len(args.Entities)),
+	}
 	cfg, err := api.st.EnvironConfig()
 	if err != nil {
-		return params.RsyslogConfigResult{}, err
-	}
-
-	rsyslogCfg, err := newRsyslogConfig(cfg, api)
-	if err != nil {
-		return params.RsyslogConfigResult{}, err
-	}
-
-	return params.RsyslogConfigResult{
-		CACert:    rsyslogCfg.CACert,
-		Port:      rsyslogCfg.Port,
-		HostPorts: rsyslogCfg.HostPorts,
-	}, nil
+		return result, err
+	}
+	for i := range args.Entities {
+		rsyslogCfg, err := newRsyslogConfig(cfg, api)
+		if err == nil {
+			result.Results[i] = params.RsyslogConfigResult{
+				CACert:    rsyslogCfg.CACert,
+				Port:      rsyslogCfg.Port,
+				HostPorts: rsyslogCfg.HostPorts,
+			}
+		} else {
+			result.Results[i].Error = common.ServerError(err)
+		}
+	}
+	return result, nil
 }
 
 // WatchForRsyslogChanges starts a watcher to track if there are changes

=== modified file 'state/apiserver/rsyslog/rsyslog_test.go'
--- state/apiserver/rsyslog/rsyslog_test.go	2014-05-22 14:34:54 +0000
+++ state/apiserver/rsyslog/rsyslog_test.go	2014-05-22 14:34:54 +0000
@@ -46,7 +46,7 @@
 }
 
 func verifyRsyslogCACert(c *gc.C, st *apirsyslog.State, expected string) {
-	cfg, err := st.GetRsyslogConfig()
+	cfg, err := st.GetRsyslogConfig("foo")
 	c.Assert(err, gc.IsNil)
 	c.Assert(cfg.CACert, gc.DeepEquals, expected)
 }

=== modified file 'worker/rsyslog/worker.go'
--- worker/rsyslog/worker.go	2014-05-22 14:34:54 +0000
+++ worker/rsyslog/worker.go	2014-05-22 14:34:54 +0000
@@ -139,7 +139,7 @@
 }
 
 func (h *RsyslogConfigHandler) Handle() error {
-	cfg, err := h.st.GetRsyslogConfig()
+	cfg, err := h.st.GetRsyslogConfig(h.tag)
 	if err != nil {
 		return errors.Annotate(err, "cannot get environ config")
 	}
@@ -147,6 +147,7 @@
 	if rsyslogCACert == "" {
 		return nil
 	}
+
 	h.syslogConfig.Port = cfg.Port
 	if h.mode == RsyslogModeForwarding {
 		if err := writeFileAtomic(h.syslogConfig.CACertPath(), []byte(rsyslogCACert), 0644, 0, 0); err != nil {