Skip to content

Commit a32e35a

Browse files
authored
fix: empty metadata during job creation panics the server (#135)
Signed-off-by: Kush <[email protected]>
1 parent 22696aa commit a32e35a

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

api/handler/v1beta1/adapter.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,11 @@ func (adapt *Adapter) FromJobProto(spec *pb.JobSpecification) (models.JobSpec, e
9090
})
9191
}
9292
}
93+
94+
metadata := models.JobSpecMetadata{}
95+
if spec.Metadata != nil {
96+
metadata.Resource = adapt.FromJobSpecMetadataResourceProto(spec.Metadata.Resource)
97+
}
9398
return models.JobSpec{
9499
Version: int(spec.Version),
95100
Name: spec.Name,
@@ -119,9 +124,7 @@ func (adapt *Adapter) FromJobProto(spec *pb.JobSpecification) (models.JobSpec, e
119124
},
120125
Dependencies: dependencies,
121126
Hooks: hooks,
122-
Metadata: models.JobSpecMetadata{
123-
Resource: adapt.FromJobSpecMetadataResourceProto(spec.Metadata.Resource),
124-
},
127+
Metadata: metadata,
125128
}, nil
126129
}
127130

ext/datastore/bigquery/adapter.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,13 +89,15 @@ func bqGoogleSheetsOptionsTo(m map[string]interface{}) *bqapi.GoogleSheetsOption
8989
var sheetRange string
9090

9191
if val, ok := m["skip_leading_rows"]; ok {
92-
skipLeadingRows = int64(val.(float64))
92+
if rows, ok := val.(float64); ok {
93+
skipLeadingRows = int64(rows)
94+
}
9395
}
94-
9596
if val, ok := m["range"]; ok {
96-
sheetRange = val.(string)
97+
if ran, ok := val.(string); ok {
98+
sheetRange = ran
99+
}
97100
}
98-
99101
return &bqapi.GoogleSheetsOptions{
100102
SkipLeadingRows: skipLeadingRows,
101103
Range: sheetRange,

0 commit comments

Comments
 (0)