Delete unused models, error and util functions

[#152081799] Delete unused cli code Signed-off-by: Iryna Shustava <[email protected]>
cloudfoundry · Oct 18, 2017 · 83db856 · 83db856
1 parent 3da6ddc
commit 83db856
Show file tree

Hide file tree

Showing 18 changed files with 7 additions and 199 deletions.
diff --git a/commands/helpers.go b/commands/helpers.go
@@ -17,7 +17,7 @@ import (
 func initializeCredhubClient(cfg config.Config) (*credhub.CredHub, error) {
 	var credhubClient *credhub.CredHub
 
-	err = config.ValidateConfig(cfg)
+	err := config.ValidateConfig(cfg)
 	if err != nil {
 		if !clientCredentialsInEnvironment() || config.ValidateConfigApi(cfg) != nil {
 			return nil, err

diff --git a/commands/import.go b/commands/import.go
@@ -17,19 +17,15 @@ type ImportCommand struct {
 	File string `short:"f" long:"file" description:"File containing credentials to import" required:"true"`
 }
 
-var (
-	err        error
-	bulkImport models.CredentialBulkImport
-)
-
 func (cmd ImportCommand) Execute([]string) error {
-	err = bulkImport.ReadFile(cmd.File)
+	var bulkImport models.CredentialBulkImport
+	err := bulkImport.ReadFile(cmd.File)
 
 	if err != nil {
 		return err
 	}
 
-	err := setCredentials(bulkImport)
+	err = setCredentials(bulkImport)
 
 	return err
 }

diff --git a/commands/logout.go b/commands/logout.go
@@ -26,7 +26,7 @@ func RevokeTokenIfNecessary(cfg config.Config) {
 		Client: client.NewHttpClient(cfg),
 	}
 
-	err = uaaClient.RevokeToken(cfg.AccessToken)
+	uaaClient.RevokeToken(cfg.AccessToken)
 }
 
 func MarkTokensAsRevokedInConfig(cfg *config.Config) {

diff --git a/commands/token.go b/commands/token.go
@@ -17,7 +17,7 @@ func init() {
 
 			authObject := credhubClient.Auth
 			oauth := authObject.(*auth.OAuthStrategy)
-			err = oauth.Refresh()
+			err := oauth.Refresh()
 
 			if err != nil {
 				fmt.Println("Bearer " + cfg.AccessToken)

diff --git a/errors/errors.go b/errors/errors.go
@@ -9,10 +9,6 @@ func NewNetworkError(e error) error {
 	return errors.New(fmt.Sprintf("Error connecting to the targeted API: %#v. Please validate your target and retry your request.", e.Error()))
 }
 
-func NewResponseError() error {
-	return errors.New("An error occurred when processing the response. Please validate your input and retry your request.")
-}
-
 func NewCatchAllError() error {
 	return errors.New("The targeted API was unable to perform the request. Please validate and retry your request.")
 }
@@ -50,18 +46,10 @@ func NewRefreshError() error {
 	return errors.New("You are not currently authenticated. Please log in to continue.")
 }
 
-func NewForbiddenError() error {
-	return errors.New("You are not authorized to perform this action. You must log in with an elevated user or contact your administrator to continue.")
-}
-
 func NewNoMatchingCredentialsFoundError() error {
 	return errors.New("No credentials exist which match the provided parameters.")
 }
 
-func NewAccessTokenExpiredError() error {
-	return errors.New("JWT access token expired")
-}
-
 func NewSetEmptyTypeError() error {
 	return errors.New("A type must be specified when setting a credential. Valid types include 'value', 'json', 'password', 'user', 'certificate', 'ssh' and 'rsa'.")
 }

diff --git a/models/certificate.go b/models/certificate.go
diff --git a/models/credential_response.go b/models/credential_response.go
diff --git a/models/credential_response_test.go b/models/credential_response_test.go
diff --git a/models/generate_request.go → models/generation_parameters.go b/models/generate_request.go → models/generation_parameters.go
@@ -1,12 +1,5 @@
 package models
 
-type GenerateRequest struct {
-	Name           string                `json:"name"`
-	CredentialType string                `json:"type"`
-	Overwrite      *bool                 `json:"overwrite"`
-	Parameters     *GenerationParameters `json:"parameters"`
-}
-
 type GenerationParameters struct {
 	IncludeSpecial   bool     `json:"include_special,omitempty"`
 	ExcludeNumber    bool     `json:"exclude_number,omitempty"`
@@ -29,4 +22,4 @@ type GenerationParameters struct {
 	IsCA             bool     `json:"is_ca,omitempty"`
 	SshComment       string   `json:"ssh_comment,omitempty"`
 	Username 		 string   `json:"username,omitempty"`
-}
+}
diff --git a/models/info.go b/models/info.go
diff --git a/models/printable.go b/models/printable.go
diff --git a/models/regenerate_request.go b/models/regenerate_request.go
diff --git a/models/request_body.go b/models/request_body.go
diff --git a/models/rsa-ssh.go b/models/rsa-ssh.go
diff --git a/models/server_error.go b/models/server_error.go
diff --git a/models/token.go b/models/token.go
diff --git a/models/user.go b/models/user.go
diff --git a/util/string_util.go b/util/string_util.go