fix get and list scheduler test

topfreegames · May 16, 2023 · 7699a28 · 7699a28
1 parent fa031c3
commit 7699a28
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 5 deletions.
diff --git a/internal/api/handlers/requestadapters/schedulers.go b/internal/api/handlers/requestadapters/schedulers.go
@@ -158,6 +158,9 @@ func FromApiNewSchedulerVersionRequestToEntity(request *api.NewSchedulerVersionR
 
 func FromEntitySchedulerToResponse(entity *entities.Scheduler) (*api.Scheduler, error) {
 	forwarders, err := fromEntityForwardersToResponse(entity.Forwarders)
+	if err != nil {
+		return nil, err
+	}
 	annotations, err := fromEntityAnnotationsToResponse(entity.Annotations)
 	if err != nil {
 		return nil, err

diff --git a/internal/api/handlers/schedulers_handler_test.go b/internal/api/handlers/schedulers_handler_test.go
@@ -271,6 +271,7 @@ func TestGetScheduler(t *testing.T) {
 					},
 				},
 			},
+			Annotations: []*entities.Annotations{},
 		}
 
 		schedulerCache.EXPECT().GetScheduler(gomock.Any(), gomock.Any()).Return(scheduler, nil)
@@ -539,6 +540,7 @@ func TestCreateScheduler(t *testing.T) {
 					},
 				},
 			},
+			Annotations: []*entities.Annotations{entities.NewAnnotations("annotation", "option")},
 		}
 
 		schedulerStorage.EXPECT().CreateScheduler(gomock.Any(), gomock.Any()).Do(
@@ -556,6 +558,10 @@ func TestCreateScheduler(t *testing.T) {
 					assert.Equal(t, scheduler.Forwarders[i].Address, forwarder.Address)
 					assert.Equal(t, scheduler.Forwarders[i].Options.Timeout, forwarder.Options.Timeout)
 				}
+				for i, annotation := range arg.Annotations {
+					assert.Equal(t, scheduler.Annotations[i].Name, annotation.Name)
+					assert.Equal(t, scheduler.Annotations[i].Opt, annotation.Opt)
+				}
 			},
 		).Return(nil)
 		operationManager.EXPECT().CreateOperation(gomock.Any(), scheduler.Name, gomock.Any()).Return(&operation.Operation{ID: "id-1"}, nil)
@@ -1235,6 +1241,7 @@ func newValidScheduler() *entities.Scheduler {
 		},
 	}
 	forwarders := []*forwarder.Forwarder{fwd}
+	annotations := []*entities.Annotations{entities.NewAnnotations("imageregistry", "https://hub.docker.com/")}
 
 	return &entities.Scheduler{
 		Name:            "scheduler-name-1",
@@ -1272,6 +1279,7 @@ func newValidScheduler() *entities.Scheduler {
 			Start: 40000,
 			End:   60000,
 		},
-		Forwarders: forwarders,
+		Forwarders:  forwarders,
+		Annotations: annotations,
 	}
 }
diff --git a/internal/core/entities/scheduler.go b/internal/core/entities/scheduler.go
@@ -63,7 +63,7 @@ type Scheduler struct {
 	CreatedAt       time.Time
 	MaxSurge        string                 `validate:"required,max_surge"`
 	Forwarders      []*forwarder.Forwarder `validate:"dive"`
-	Annotations     []*Annotations         `validate:"optional"`
+	Annotations     []*Annotations
 }
 
 type Annotations struct {

diff --git a/pkg/api/v1/messages.pb.go b/pkg/api/v1/messages.pb.go
diff --git a/proto/api/v1/messages.proto b/proto/api/v1/messages.proto
@@ -45,7 +45,9 @@ message Container {
 }
 // Annotation should add a annotation to scheduler
 message Annotation{
+  // name of the annotation
   string name = 1;
+  // required annotation value or option
   string value = 2;
 }
 

diff --git a/proto/apidocs.swagger.json b/proto/apidocs.swagger.json
@@ -893,10 +893,12 @@
       "type": "object",
       "properties": {
         "name": {
-          "type": "string"
+          "type": "string",
+          "title": "name of the annotation"
         },
         "value": {
-          "type": "string"
+          "type": "string",
+          "title": "required annotation value or option"
         }
       },
       "title": "Annotation should add a annotation to scheduler"