From c1ed28fd254305737c973882be3a5f30d6dd729f Mon Sep 17 00:00:00 2001
From: Dmitry Ukov <dukov@mirantis.com>
Date: Sun, 1 Dec 2019 14:14:09 +0400
Subject: [PATCH] Move all error structs to common package 'errors'

Change-Id: I91e9610b27244fe5d7500575eae24647e256dab8
---
 pkg/error/error.go           | 14 --------------
 pkg/errors/common.go         | 13 +++++++++++++
 pkg/remote/errors.go         |  2 +-
 pkg/remote/redfish/errors.go |  2 +-
 4 files changed, 15 insertions(+), 16 deletions(-)
 delete mode 100644 pkg/error/error.go

diff --git a/pkg/error/error.go b/pkg/error/error.go
deleted file mode 100644
index 1822acf7b..000000000
--- a/pkg/error/error.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package error
-
-// AirshipError is the base error type
-// used to create extended error types
-// in other airshipctl packages.
-type AirshipError struct {
-	Message string
-}
-
-// Error function implments the golang
-// error interface
-func (ae *AirshipError) Error() string {
-	return ae.Message
-}
diff --git a/pkg/errors/common.go b/pkg/errors/common.go
index 16ec47ce1..1b948d7e6 100644
--- a/pkg/errors/common.go
+++ b/pkg/errors/common.go
@@ -1,5 +1,18 @@
 package errors
 
+// AirshipError is the base error type
+// used to create extended error types
+// in other airshipctl packages.
+type AirshipError struct {
+	Message string
+}
+
+// Error function implments the golang
+// error interface
+func (ae *AirshipError) Error() string {
+	return ae.Message
+}
+
 // ErrNotImplemented returned for not implemented features
 type ErrNotImplemented struct {
 }
diff --git a/pkg/remote/errors.go b/pkg/remote/errors.go
index 4fea0965b..f1a57645c 100644
--- a/pkg/remote/errors.go
+++ b/pkg/remote/errors.go
@@ -3,7 +3,7 @@ package remote
 import (
 	"fmt"
 
-	aerror "opendev.org/airship/airshipctl/pkg/error"
+	aerror "opendev.org/airship/airshipctl/pkg/errors"
 )
 
 type RemoteDirectError struct {
diff --git a/pkg/remote/redfish/errors.go b/pkg/remote/redfish/errors.go
index d0d02f50a..1a87d6a2c 100644
--- a/pkg/remote/redfish/errors.go
+++ b/pkg/remote/redfish/errors.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	aerror "opendev.org/airship/airshipctl/pkg/error"
+	aerror "opendev.org/airship/airshipctl/pkg/errors"
 )
 
 type RedfishClientError struct {