self-hosted/teleport
self-hosted/teleport
1
0
Fork 0
mirror of https://github.com/gravitational/teleport synced 2024-10-21 01:34:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix staticcheck findings in lib/services/...

Browse source 
Fixed findings:
```
lib/services/github_test.go:99:2: SA4006: this value of `kubeUsers` is never used (staticcheck)
	logins, kubeGroups, kubeUsers = connector.MapClaims(GithubClaims{
	^
lib/services/github_test.go:107:2: SA4006: this value of `kubeUsers` is never used (staticcheck)
	logins, kubeGroups, kubeUsers = connector.MapClaims(GithubClaims{
	^
lib/services/local/configuration_test.go:84:2: SA4006: this value of `clusterConfig` is never used (staticcheck)
	clusterConfig, err := services.NewClusterConfig(services.ClusterConfigSpecV3{
	^
lib/services/local/configuration_test.go:102:2: SA4006: this value of `clusterConfig` is never used (staticcheck)
	clusterConfig, err := services.NewClusterConfig(services.ClusterConfigSpecV3{})
	^
lib/services/local/presence_test.go:108:2: SA4006: this value of `gotTC` is never used (staticcheck)
	gotTC, err = presenceBackend.GetTrustedCluster("foo")
	^
lib/services/suite/suite.go:157:2: SA4006: this value of `err` is never used (staticcheck)
	out, err := s.WebS.GetUser("user1", false)
	^
lib/services/suite/suite.go:208:2: SA4006: this value of `u` is never used (staticcheck)
	u, err = s.WebS.GetUser("foo", false)
	^
lib/services/suite/suite.go:277:2: SA4006: this value of `err` is never used (staticcheck)
	err = s.CAS.CompareAndSwapCertAuthority(&newCA, ca)
	^
lib/services/suite/suite.go:339:2: SA4006: this value of `err` is never used (staticcheck)
	out, err = s.PresenceS.GetProxies()
	^
lib/services/suite/suite.go:1136:5: SA4006: this value of `err` is never used (staticcheck)
				role, err := services.NewRole("role1", services.RoleSpecV3{
				^
lib/services/suite/suite.go:1166:5: SA4006: this value of `err` is never used (staticcheck)
				err := s.Users().UpsertUser(user)
				^
```
This commit is contained in:
Andrew Lytvynov 2020-04-27 14:20:07 -07:00 committed by Andrew Lytvynov
parent 935375a00d
commit 24ae390bb9
4 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/services/github_test.go
View file

@ -103,6 +103,7 @@ func (s *GithubSuite) TestMapClaims(c *check.C) {
})
c.Assert(logins, check.DeepEquals, []string{"dev", "test"})
c.Assert(kubeGroups, check.DeepEquals, []string{"kube-devs"})
c.Assert(kubeUsers, check.DeepEquals, []string(nil))
logins, kubeGroups, kubeUsers = connector.MapClaims(GithubClaims{
OrganizationToTeams: map[string][]string{
@ -111,4 +112,5 @@ func (s *GithubSuite) TestMapClaims(c *check.C) {
})
c.Assert(logins, check.DeepEquals, []string{"admin", "dev", "test"})
c.Assert(kubeGroups, check.DeepEquals, []string{"system:masters", "kube-devs"})
c.Assert(kubeUsers, check.DeepEquals, []string{"alice@example.com"})
}

9
lib/services/local/configuration_test.go
View file

@ -81,13 +81,13 @@ func (s *ClusterConfigurationSuite) TestStaticTokens(c *check.C) {
func (s *ClusterConfigurationSuite) TestSessionRecording(c *check.C) {
// don't allow invalid session recording values
clusterConfig, err := services.NewClusterConfig(services.ClusterConfigSpecV3{
_, err := services.NewClusterConfig(services.ClusterConfigSpecV3{
SessionRecording: "foo",
})
c.Assert(err, check.NotNil)
// default is to record at the node
clusterConfig, err = services.NewClusterConfig(services.ClusterConfigSpecV3{})
clusterConfig, err := services.NewClusterConfig(services.ClusterConfigSpecV3{})
c.Assert(err, check.IsNil)
recordingType := clusterConfig.GetSessionRecording()
c.Assert(recordingType, check.Equals, services.RecordAtNode)
@ -99,11 +99,8 @@ func (s *ClusterConfigurationSuite) TestSessionRecording(c *check.C) {
}
func (s *ClusterConfigurationSuite) TestAuditConfig(c *check.C) {
clusterConfig, err := services.NewClusterConfig(services.ClusterConfigSpecV3{})
c.Assert(err, check.IsNil)
// default is to record at the node
clusterConfig, err = services.NewClusterConfig(services.ClusterConfigSpecV3{})
clusterConfig, err := services.NewClusterConfig(services.ClusterConfigSpecV3{})
c.Assert(err, check.IsNil)
cfg := clusterConfig.GetAuditConfig()

2
lib/services/local/presence_test.go
View file

@ -105,7 +105,7 @@ func (s *PresenceSuite) TestTrustedClusterCRUD(c *check.C) {
c.Assert(err, check.IsNil)
// make sure it's really gone
gotTC, err = presenceBackend.GetTrustedCluster("foo")
_, err = presenceBackend.GetTrustedCluster("foo")
c.Assert(err, check.NotNil)
c.Assert(trace.IsNotFound(err), check.Equals, true)
}

7
lib/services/suite/suite.go
View file

@ -155,6 +155,7 @@ func (s *ServicesTestSuite) UsersCRUD(c *check.C) {
userSlicesEqual(c, u, []services.User{newUser("user1", nil), newUser("user2", nil)})
out, err := s.WebS.GetUser("user1", false)
c.Assert(err, check.IsNil)
usersEqual(c, out, u[0])
user := newUser("user1", []string{"admin", "user"})
@ -205,7 +206,7 @@ func (s *ServicesTestSuite) UsersExpiry(c *check.C) {
s.Clock.Advance(2 * time.Minute)
// Make sure the user is now gone.
u, err = s.WebS.GetUser("foo", false)
_, err = s.WebS.GetUser("foo", false)
c.Assert(err, check.NotNil)
}
@ -275,6 +276,7 @@ func (s *ServicesTestSuite) CertAuthCRUD(c *check.C) {
newCA.SetRotation(rotation)
err = s.CAS.CompareAndSwapCertAuthority(&newCA, ca)
c.Assert(err, check.IsNil)
out, err = s.CAS.GetCertAuthority(ca.GetID(), true)
c.Assert(err, check.IsNil)
@ -337,6 +339,7 @@ func (s *ServicesTestSuite) ServerCRUD(c *check.C) {
c.Assert(err, check.IsNil)
out, err = s.PresenceS.GetProxies()
c.Assert(err, check.IsNil)
c.Assert(out, check.HasLen, 0)
out, err = s.PresenceS.GetAuthServers()
@ -1143,6 +1146,7 @@ func (s *ServicesTestSuite) Events(c *check.C) {
},
Deny: services.RoleConditions{},
})
c.Assert(err, check.IsNil)
err = s.Access.UpsertRole(role)
c.Assert(err, check.IsNil)
@ -1164,6 +1168,7 @@ func (s *ServicesTestSuite) Events(c *check.C) {
crud: func() services.Resource {
user := newUser("user1", []string{"admin"})
err := s.Users().UpsertUser(user)
c.Assert(err, check.IsNil)
out, err := s.Users().GetUser(user.GetName(), false)
c.Assert(err, check.IsNil)