refactor: use api v1beta1 instead of v1

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

Author: kushsharma

Makefile

@@ -5,7 +5,7 @@ NAME = "github.com/odpf/optimus"
 LAST_COMMIT := $(shell git rev-parse --short HEAD)
 LAST_TAG := "$(shell git rev-list --tags --max-count=1)"
 OPMS_VERSION := "$(shell git describe --tags ${LAST_TAG})-next"
-PROTON_COMMIT := "00a4f30ab69c44650c819f68c118d9c0a0d69e7d"
+PROTON_COMMIT := "1ff5d1bca91c05be0f6288b188add035b0eb5989"
 
 all: build
 

api/handler/v1/adapter.go

@@ -4,6 +4,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/odpf/optimus/utils"
+
 	"google.golang.org/protobuf/types/known/durationpb"
 
 	"github.com/golang/protobuf/proto"
@@ -82,7 +84,7 @@ func (adapt *Adapter) FromJobProto(spec *pb.JobSpecification) (models.JobSpec, e
 
 		for _, notify := range spec.Behavior.Notify {
 			notifiers = append(notifiers, models.JobSpecNotifier{
-				On:       models.JobEventType(strings.TrimPrefix(strings.ToLower(notify.On.String()), "type_")),
+				On:       models.JobEventType(utils.FromEnumProto(notify.On.String(), "type")),
 				Config:   notify.Config,
 				Channels: notify.Channels,
 			})
@@ -154,7 +156,7 @@ func (adapt *Adapter) ToJobProto(spec models.JobSpec) (*pb.JobSpecification, err
 	var notifyProto []*pb.JobSpecification_Behavior_Notifiers
 	for _, notify := range spec.Behavior.Notify {
 		notifyProto = append(notifyProto, &pb.JobSpecification_Behavior_Notifiers{
-			On:       pb.JobEvent_Type(pb.JobEvent_Type_value["TYPE_"+strings.ToUpper(string(notify.On))]),
+			On:       pb.JobEvent_Type(pb.JobEvent_Type_value[utils.ToEnumProto(string(notify.On), "type")]),
 			Channels: notify.Channels,
 			Config:   notify.Config,
 		})

api/handler/v1/runtime.go

@@ -375,7 +375,7 @@ func (sv *RuntimeServiceServer) CreateJobSpecification(ctx context.Context, req
 	}, nil
 }
 
-func (sv *RuntimeServiceServer) ReadJobSpecification(ctx context.Context, req *pb.ReadJobSpecificationRequest) (*pb.ReadJobSpecificationResponse, error) {
+func (sv *RuntimeServiceServer) GetJobSpecification(ctx context.Context, req *pb.GetJobSpecificationRequest) (*pb.GetJobSpecificationResponse, error) {
 	projectRepo := sv.projectRepoFactory.New()
 	projSpec, err := projectRepo.GetByName(ctx, req.GetProjectName())
 	if err != nil {
@@ -398,7 +398,7 @@ func (sv *RuntimeServiceServer) ReadJobSpecification(ctx context.Context, req *p
 		return nil, status.Errorf(codes.Internal, "cannot serialize job: \n%s", err.Error())
 	}
 
-	return &pb.ReadJobSpecificationResponse{
+	return &pb.GetJobSpecificationResponse{
 		Spec: jobSpecAdapt,
 	}, nil
 }

api/handler/v1/runtime_test.go

@@ -849,7 +849,7 @@ func TestRuntimeServiceServer(t *testing.T) {
 		})
 	})
 
-	t.Run("ReadJobSpecification", func(t *testing.T) {
+	t.Run("GetJobSpecification", func(t *testing.T) {
 		t.Run("should read a job spec", func(t *testing.T) {
 			Version := "1.0.1"
 
@@ -943,8 +943,8 @@ func TestRuntimeServiceServer(t *testing.T) {
 			)
 
 			jobSpecAdapted, _ := adapter.ToJobProto(jobSpecs[0])
-			deployRequest := pb.ReadJobSpecificationRequest{ProjectName: projectName, JobName: jobSpecs[0].Name, Namespace: namespaceSpec.Name}
-			jobSpecResp, err := runtimeServiceServer.ReadJobSpecification(context.Background(), &deployRequest)
+			deployRequest := pb.GetJobSpecificationRequest{ProjectName: projectName, JobName: jobSpecs[0].Name, Namespace: namespaceSpec.Name}
+			jobSpecResp, err := runtimeServiceServer.GetJobSpecification(context.Background(), &deployRequest)
 			assert.Nil(t, err)
 			assert.Equal(t, jobSpecAdapted, jobSpecResp.Spec)
 		})