Remove OAM

Signed-off-by: GitHub <[email protected]>

Makefile

@@ -1,4 +1,7 @@
-.PHONY: lint tidy verify
+.PHONY: check
+check: lint
+check: tidy
+check: verify
 
 
 lint:

adapter/adapter.go

@@ -33,11 +33,8 @@ type Handler interface {
 	// CreateInstance(*chan interface{}) error                 // Instantiates clients used in deploying and managing mesh instances, e.g. Kubernetes clients.
 	ApplyOperation(context.Context, OperationRequest) error // Applies an adapter operation. This is adapter specific and needs to be implemented by each adapter.
 	ListOperations() (Operations, error)                    // List all operations an adapter supports.
-	ProcessOAM(ctx context.Context, srv OAMRequest) (string, error)
-
-	// Need not implement this method and can be reused
-	StreamErr(*meshes.EventsResponse, error) // Streams an error event, e.g. to a channel
-	StreamInfo(*meshes.EventsResponse)       // Streams an informational event, e.g. to a channel
+	StreamErr(*meshes.EventsResponse, error)                // Streams an error event, e.g. to a channel
+	StreamInfo(*meshes.EventsResponse)                      // Streams an informational event, e.g. to a channel
 }
 
 // Adapter contains all handlers, channels, clients, and other parameters for an adapter.

adapter/error.go

@@ -19,30 +19,27 @@ import (
 )
 
 const (
-	ErrGetNameCode              = "1000"
-	ErrCreateInstanceCode       = "1001"
-	ErrMeshConfigCode           = "1002"
-	ErrValidateKubeconfigCode   = "1003"
-	ErrClientConfigCode         = "1004"
-	ErrClientSetCode            = "1005"
-	ErrStreamEventCode          = "1006"
-	ErrOpInvalidCode            = "1007"
-	ErrApplyOperationCode       = "1008"
-	ErrListOperationsCode       = "1009"
-	ErrNewSmiCode               = "1010"
-	ErrRunSmiCode               = "1011"
-	ErrNoResponseCode           = "1011"
-	ErrOpenOAMDefintionFileCode = "1013"
-	ErrOpenOAMRefFileCode       = "1014"
-	ErrJSONMarshalCode          = "1015"
-	ErrOAMRetryCode             = "1016"
-	ErrSmiInitCode              = "1007"
-	ErrInstallSmiCode           = "1008"
-	ErrConnectSmiCode           = "1009"
-	ErrDeleteSmiCode            = "1010"
-	ErrGenerateComponentsCode   = "1011"
-	ErrAuthInfosInvalidMsgCode  = "1012"
-	ErrCreatingComponentsCode   = "1013"
+	ErrGetNameCode             = "1000"
+	ErrCreateInstanceCode      = "1001"
+	ErrMeshConfigCode          = "1002"
+	ErrValidateKubeconfigCode  = "1003"
+	ErrClientConfigCode        = "1004"
+	ErrClientSetCode           = "1005"
+	ErrStreamEventCode         = "1006"
+	ErrOpInvalidCode           = "1007"
+	ErrApplyOperationCode      = "1008"
+	ErrListOperationsCode      = "1009"
+	ErrNewSmiCode              = "1010"
+	ErrRunSmiCode              = "1011"
+	ErrNoResponseCode          = "1011"
+	ErrJSONMarshalCode         = "1015"
+	ErrSmiInitCode             = "1007"
+	ErrInstallSmiCode          = "1008"
+	ErrConnectSmiCode          = "1009"
+	ErrDeleteSmiCode           = "1010"
+	ErrGenerateComponentsCode  = "1011"
+	ErrAuthInfosInvalidMsgCode = "1012"
+	ErrCreatingComponentsCode  = "1013"
 )
 
 var (
@@ -116,25 +113,6 @@ func ErrDeleteSmi(err error) error {
 	return errors.New(ErrDeleteSmiCode, errors.Alert, []string{"Error deleting smi tool: %s"}, []string{err.Error()}, []string{}, []string{})
 }
 
-// ErrOpenOAMDefintionFile is the error for opening OAM Definition file
-func ErrOpenOAMDefintionFile(err error) error {
-	return errors.New(ErrOpenOAMDefintionFileCode, errors.Alert, []string{"error opening OAM Definition File: %s"}, []string{err.Error()}, []string{}, []string{})
-}
-
-// ErrOpenOAMRefFile is the error for opening OAM Schema Ref file
-func ErrOpenOAMRefFile(err error) error {
-	return errors.New(ErrOpenOAMRefFileCode, errors.Alert, []string{"error opening OAM Schema Ref File: %s"}, []string{err.Error()}, []string{}, []string{})
-}
-
-// ErrJSONMarshal is the error for json marhal failure
-func ErrJSONMarshal(err error) error {
-	return errors.New(ErrOAMRetryCode, errors.Alert, []string{"error marshal JSON: %s"}, []string{err.Error()}, []string{}, []string{})
-}
-
-func ErrOAMRetry(err error) error {
-	return errors.New(ErrOAMRetryCode, errors.Alert, []string{"error marshal JSON: %s"}, []string{err.Error()}, []string{}, []string{})
-}
-
 // will be depracated
 func ErrGenerateComponents(err error) error {
 	return errors.New(ErrGenerateComponentsCode, errors.Alert, []string{"error generating components"}, []string{err.Error()}, []string{"Invalid component generation method passed, Some invalid field passed in DynamicComponentsConfig"}, []string{"Pass the correct GenerationMethod in DynamicComponentsConfig", "Pass the correct fields in DynamicComponentsConfig"})

adapter/logger.go

@@ -48,15 +48,6 @@ func (s *adapterLogger) GetComponentInfo(svc interface{}) error {
 	return s.next.GetComponentInfo(svc)
 }
 
-// func (s *adapterLogger) CreateInstance(c *chan interface{}) error {
-// 	s.log.Info("Creating instance")
-// 	err := s.next.CreateInstance(c)
-// 	if err != nil {
-// 		s.log.Error(err)
-// 	}
-// 	return err
-// }
-
 func (s *adapterLogger) ApplyOperation(ctx context.Context, op OperationRequest) error {
 	s.log.Info("Applying operation ", op.OperationName)
 	err := s.next.ApplyOperation(ctx, op)
@@ -66,17 +57,6 @@ func (s *adapterLogger) ApplyOperation(ctx context.Context, op OperationRequest)
 	return err
 }
 
-// ProcessOAM wraps the Handler's ProcessOAM method along with relevant logging
-func (s *adapterLogger) ProcessOAM(ctx context.Context, oamRequest OAMRequest) (string, error) {
-	s.log.Info("Process OAM components")
-	msg, err := s.next.ProcessOAM(ctx, oamRequest)
-	if err != nil {
-		s.log.Error(err)
-	}
-
-	return msg, err
-}
-
 func (s *adapterLogger) ListOperations() (Operations, error) {
 	s.log.Info("Listing Operations")
 	ops, err := s.next.ListOperations()