fix: check for nil project when adapting proto specification

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

Author: kushsharma

api/handler/v1/adapter.go

@@ -225,16 +225,23 @@ func (adapt *Adapter) ToProjectProtoWithSecrets(spec models.ProjectSpec) *pb.Pro
 }
 
 func (adapt *Adapter) FromProjectProtoWithSecrets(conf *pb.ProjectSpecification) models.ProjectSpec {
+	if conf == nil {
+		return models.ProjectSpec{}
+	}
 	pConf := map[string]string{}
-	for key, val := range conf.GetConfig() {
-		pConf[strings.ToUpper(key)] = val
+	if conf.GetConfig() != nil {
+		for key, val := range conf.GetConfig() {
+			pConf[strings.ToUpper(key)] = val
+		}
 	}
 	pSec := models.ProjectSecrets{}
-	for _, s := range conf.GetSecrets() {
-		pSec = append(pSec, models.ProjectSecretItem{
-			Name:  s.Name,
-			Value: s.Value,
-		})
+	if conf.GetSecrets() != nil {
+		for _, s := range conf.GetSecrets() {
+			pSec = append(pSec, models.ProjectSecretItem{
+				Name:  s.Name,
+				Value: s.Value,
+			})
+		}
 	}
 	return models.ProjectSpec{
 		Name:   conf.GetName(),

api/handler/v1/adapter_test.go

@@ -2,9 +2,12 @@ package v1_test
 
 import (
 	"context"
+	"reflect"
 	"testing"
 	"time"
 
+	pb "github.com/odpf/optimus/api/proto/odpf/optimus"
+
 	"github.com/odpf/optimus/mock"
 
 	v1 "github.com/odpf/optimus/api/handler/v1"
@@ -86,3 +89,59 @@ func TestAdapter(t *testing.T) {
 		assert.Nil(t, err)
 	})
 }
+
+func TestAdapter_FromProjectProtoWithSecrets(t *testing.T) {
+	type args struct {
+		conf *pb.ProjectSpecification
+	}
+	tests := []struct {
+		name string
+		args args
+		want models.ProjectSpec
+	}{
+		{
+			name: "null project should be handled correctly",
+			args: args{
+				conf: nil,
+			},
+			want: models.ProjectSpec{},
+		},
+		{
+			name: "proto should be converted correctly",
+			args: args{
+				conf: &pb.ProjectSpecification{
+					Name: "hello",
+					Config: map[string]string{
+						"key": "val",
+					},
+					Secrets: []*pb.ProjectSpecification_ProjectSecret{
+						{
+							Name:  "key",
+							Value: "sec",
+						},
+					},
+				},
+			},
+			want: models.ProjectSpec{
+				Name: "hello",
+				Config: map[string]string{
+					"KEY": "val",
+				},
+				Secret: []models.ProjectSecretItem{
+					{
+						Name:  "key",
+						Value: "sec",
+					},
+				},
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			adapt := &v1.Adapter{}
+			if got := adapt.FromProjectProtoWithSecrets(tt.args.conf); !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("FromProjectProtoWithSecrets() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}