update client to latest swagger spec (#128)

api_keys.go

@@ -64,7 +64,7 @@ func (rc *RockClient) GetAPIKey(ctx context.Context, name string,
 		user = *opts.User
 	}
 
-	getReq := rc.APIKeysApi.GetApiKey(ctx, user, name).Reveal(opts.Reveal)
+	getReq := rc.APIKeysApi.GetApiKey(ctx, user, name)
 
 	err = rc.Retry(ctx, func() error {
 		resp, httpResp, err = getReq.Execute()

api_keys_test.go

@@ -43,27 +43,20 @@ func (s *SuiteAPIKey) TearDownSuite() {
 	s.Require().NoError(err)
 }
 
-const mask = "************************************************************"
-
 func (s *SuiteAPIKey) TestGetAPIKey() {
 	ctx := testCtx()
 	key, err := s.rc.GetAPIKey(ctx, s.keyName)
 	s.Require().NoError(err)
-	s.Assert().Equalf(mask, key.Key[4:], "key should be masked")
+	s.Equal(6, len(key.GetKey()), "key hash should be 6 characters")
+	key.GetCreatedByApikeyName()
+	key.GetLastAccessTime()
 }
 
 func (s *SuiteAPIKey) TestUpdateAPIKey() {
 	ctx := testCtx()
 	key, err := s.rc.UpdateAPIKey(ctx, s.keyName, option.State(option.KeySuspended))
 	s.Require().NoError(err)
-	s.Assert().NotEqual(option.KeyActive, key.GetState())
-}
-
-func (s *SuiteAPIKey) TestGetAPIKeyWithReveal() {
-	ctx := testCtx()
-	key, err := s.rc.GetAPIKey(ctx, s.keyName, option.RevealKey())
-	s.Require().NoError(err)
-	s.Assert().NotEqualf(mask, key.Key[4:], "key should not be masked")
+	s.NotEqual(option.KeyActive, key.GetState())
 }
 
 func (s *SuiteAPIKey) TestListAPIKeys() {
@@ -78,5 +71,5 @@ func (s *SuiteAPIKey) TestListAPIKeys() {
 		}
 	}
 
-	s.Assert().True(found)
+	s.True(found)
 }

go.mod

@@ -31,7 +31,7 @@ require (
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/jinzhu/copier v0.3.5 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.18 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mitchellh/mapstructure v1.4.1 // indirect
 	github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect

go.sum

@@ -149,8 +149,8 @@ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxec
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
-github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98=
-github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/moby/sys/mountinfo v0.5.0/go.mod h1:3bMD3Rg+zkqx8MRYPi7Pyb0Ie97QEBmdxbhnCLlSvSU=