From c1d1fd030921bfc8da0b09405aeddeb517395056 Mon Sep 17 00:00:00 2001 From: Marcin Olszewski Date: Mon, 8 May 2017 14:03:39 +0200 Subject: [PATCH] revert formatting changes so that gofmt check doesn't complain --- control/control_security_test.go | 34 +++++++++++++++---------------- control/fixtures/tls_cert_util.go | 10 ++++----- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/control/control_security_test.go b/control/control_security_test.go index c53ba8bbd..93cf6dc7c 100644 --- a/control/control_security_test.go +++ b/control/control_security_test.go @@ -86,12 +86,12 @@ func TestSecureCollector(t *testing.T) { Convey("Having a secure collector", t, func() { var ap *availablePlugin Convey("framework should establish secure connection", func() { - security := client.SecurityTLSExtended(tlsTestCli + fixtures.TestCrtFileExt, tlsTestCli + fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) + security := client.SecurityTLSExtended(tlsTestCli+fixtures.TestCrtFileExt, tlsTestCli+fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) var err error ap, err = runPlugin(plugin.Arg{}. - SetCertPath(tlsTestSrv + fixtures.TestCrtFileExt). - SetKeyPath(tlsTestSrv + fixtures.TestKeyFileExt). - SetCACertPaths(tlsTestCA + fixtures.TestCrtFileExt). + SetCertPath(tlsTestSrv+fixtures.TestCrtFileExt). + SetKeyPath(tlsTestSrv+fixtures.TestKeyFileExt). + SetCACertPaths(tlsTestCA+fixtures.TestCrtFileExt). SetTLSEnabled(true), helper.PluginFilePath("snap-plugin-collector-mock2-grpc"), security) So(err, ShouldBeNil) @@ -128,12 +128,12 @@ func TestSecureProcessor(t *testing.T) { Convey("Having a secure processor", t, func() { var ap *availablePlugin Convey("framework should establish secure connection", func() { - security := client.SecurityTLSExtended(tlsTestCli + fixtures.TestCrtFileExt, tlsTestCli + fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) + security := client.SecurityTLSExtended(tlsTestCli+fixtures.TestCrtFileExt, tlsTestCli+fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) var err error ap, err = runPlugin(plugin.Arg{}. - SetCertPath(tlsTestSrv + fixtures.TestCrtFileExt). - SetKeyPath(tlsTestSrv + fixtures.TestKeyFileExt). - SetCACertPaths(tlsTestCA + fixtures.TestCrtFileExt). + SetCertPath(tlsTestSrv+fixtures.TestCrtFileExt). + SetKeyPath(tlsTestSrv+fixtures.TestKeyFileExt). + SetCACertPaths(tlsTestCA+fixtures.TestCrtFileExt). SetTLSEnabled(true), helper.PluginFilePath("snap-plugin-processor-passthru-grpc"), security) So(err, ShouldBeNil) @@ -166,12 +166,12 @@ func TestSecurePublisher(t *testing.T) { Convey("Having a secure publisher", t, func() { var ap *availablePlugin Convey("framework should establish secure connection", func() { - security := client.SecurityTLSExtended(tlsTestCli + fixtures.TestCrtFileExt, tlsTestCli + fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) + security := client.SecurityTLSExtended(tlsTestCli+fixtures.TestCrtFileExt, tlsTestCli+fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) var err error ap, err = runPlugin(plugin.NewArg(int(log.DebugLevel), false). - SetCertPath(tlsTestSrv + fixtures.TestCrtFileExt). - SetKeyPath(tlsTestSrv + fixtures.TestKeyFileExt). - SetCACertPaths(tlsTestCA + fixtures.TestCrtFileExt). + SetCertPath(tlsTestSrv+fixtures.TestCrtFileExt). + SetKeyPath(tlsTestSrv+fixtures.TestKeyFileExt). + SetCACertPaths(tlsTestCA+fixtures.TestCrtFileExt). SetTLSEnabled(true), helper.PluginFilePath("snap-plugin-publisher-mock-file-grpc"), security) So(err, ShouldBeNil) @@ -211,12 +211,12 @@ func TestSecureStreamingCollector(t *testing.T) { Convey("Having a secure streaming collector", t, func() { var ap *availablePlugin Convey("framework should establish secure connection", func() { - security := client.SecurityTLSExtended(tlsTestCli + fixtures.TestCrtFileExt, tlsTestCli + fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) + security := client.SecurityTLSExtended(tlsTestCli+fixtures.TestCrtFileExt, tlsTestCli+fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) var err error ap, err = runPlugin(plugin.Arg{}. - SetCertPath(tlsTestSrv + fixtures.TestCrtFileExt). - SetKeyPath(tlsTestSrv + fixtures.TestKeyFileExt). - SetCACertPaths(tlsTestCA + fixtures.TestCrtFileExt). + SetCertPath(tlsTestSrv+fixtures.TestCrtFileExt). + SetKeyPath(tlsTestSrv+fixtures.TestKeyFileExt). + SetCACertPaths(tlsTestCA+fixtures.TestCrtFileExt). SetTLSEnabled(true), helper.PluginFilePath("snap-plugin-stream-collector-rand1"), security) So(err, ShouldBeNil) @@ -345,7 +345,7 @@ func TestInsecureConfigurationFails(t *testing.T) { }, } for _, tc := range tcs { - security := client.SecurityTLSExtended(tlsTestCli + fixtures.TestCrtFileExt, tlsTestCli + fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) + security := client.SecurityTLSExtended(tlsTestCli+fixtures.TestCrtFileExt, tlsTestCli+fixtures.TestKeyFileExt, client.SecureClient, []string{tlsTestCA + fixtures.TestCrtFileExt}) pluginArgs := plugin.Arg{}. SetCertPath(tlsTestSrv + fixtures.TestCrtFileExt). SetKeyPath(tlsTestSrv + fixtures.TestKeyFileExt). diff --git a/control/fixtures/tls_cert_util.go b/control/fixtures/tls_cert_util.go index 2634367ce..9b2b22503 100644 --- a/control/fixtures/tls_cert_util.go +++ b/control/fixtures/tls_cert_util.go @@ -154,7 +154,7 @@ func (u CertTestUtil) StoreTLSCerts(caCN, srvCN, cliCN string) (resFiles []strin if err != nil { return nil, err } - caCertFn := filepath.Join(u.Prefix, caCN + TestCrtFileExt) + caCertFn := filepath.Join(u.Prefix, caCN+TestCrtFileExt) if err := u.WritePEMFile(caCertFn, certificatePEMHeader, caCert); err != nil { return nil, err } @@ -172,8 +172,8 @@ func (u CertTestUtil) StoreTLSCerts(caCN, srvCN, cliCN string) (resFiles []strin if err != nil { return resFiles, err } - srvCertFn := filepath.Join(u.Prefix, srvCN + TestCrtFileExt) - srvKeyFn := filepath.Join(u.Prefix, srvCN + TestKeyFileExt) + srvCertFn := filepath.Join(u.Prefix, srvCN+TestCrtFileExt) + srvKeyFn := filepath.Join(u.Prefix, srvCN+TestKeyFileExt) if err := u.WritePEMFile(srvCertFn, certificatePEMHeader, srvCert); err != nil { return resFiles, err } @@ -186,8 +186,8 @@ func (u CertTestUtil) StoreTLSCerts(caCN, srvCN, cliCN string) (resFiles []strin if err != nil { return resFiles, err } - cliCertFn := filepath.Join(u.Prefix, cliCN + TestCrtFileExt) - cliKeyFn := filepath.Join(u.Prefix, cliCN + TestKeyFileExt) + cliCertFn := filepath.Join(u.Prefix, cliCN+TestCrtFileExt) + cliKeyFn := filepath.Join(u.Prefix, cliCN+TestKeyFileExt) if err := u.WritePEMFile(cliCertFn, certificatePEMHeader, cliCert); err != nil { return resFiles, err }