Skip to content
This repository has been archived by the owner on Nov 8, 2022. It is now read-only.

Commit

Permalink
revert formatting changes so that gofmt check doesn't complain
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcin-ol
marcin-ol committed May 8, 2017
1 parent 23b70ea commit c1d1fd0
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
34 changes: 17 additions & 17 deletions control/control_security_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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).
Expand Down
10 changes: 5 additions & 5 deletions control/fixtures/tls_cert_util.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
}
Expand All @@ -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
}
Expand Down

0 comments on commit c1d1fd0

Please sign in to comment.