Skip to content

Commit 65f9d3e

Browse files
author
Muhammad Naufal Andika Natsir Putra
committed
chore: refactor line with char > 120
1 parent 864a033 commit 65f9d3e

File tree

2 files changed

+47
-24
lines changed

2 files changed

+47
-24
lines changed

‎api/turing/imagebuilder/imagebuilder.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,8 @@ func (ib *imageBuilder) getHashedModelDependenciesUrl(ctx context.Context, artif
677677
return "", err
678678
}
679679

680-
condaEnvUrl := fmt.Sprintf("%s://%s/%s/ensembler/conda.yaml", ib.artifactService.GetURLScheme(), artifactURL.Bucket, artifactURL.Object)
680+
urlSchema := ib.artifactService.GetURLScheme()
681+
condaEnvUrl := fmt.Sprintf("%s://%s/%s/ensembler/conda.yaml", urlSchema, artifactURL.Bucket, artifactURL.Object)
681682

682683
condaEnv, err := ib.artifactService.ReadArtifact(ctx, condaEnvUrl)
683684
if err != nil {
@@ -688,7 +689,7 @@ func (ib *imageBuilder) getHashedModelDependenciesUrl(ctx context.Context, artif
688689
hash.Write(condaEnv)
689690
hashEnv := hash.Sum(nil)
690691

691-
hashedDependenciesUrl := fmt.Sprintf("%s://%s%s/%x", ib.artifactService.GetURLScheme(), artifactURL.Bucket, modelDependenciesPath, hashEnv)
692+
hashedDependenciesUrl := fmt.Sprintf("%s://%s%s/%x", urlSchema, artifactURL.Bucket, modelDependenciesPath, hashEnv)
692693

693694
_, err = ib.artifactService.ReadArtifact(ctx, hashedDependenciesUrl)
694695
if err == nil {

‎api/turing/imagebuilder/imagebuilder_test.go

+44-22
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ func TestBuildPyFuncEnsemblerJobImage(t *testing.T) {
166166
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
167167
artifactServiceMock.On("GetURLScheme").Return("gs")
168168
artifactServiceMock.On("GetURLScheme").Return("gs")
169-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
169+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
170+
Return([]byte(testCondaEnvContent), nil)
170171
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
171172
},
172173
},
@@ -235,7 +236,8 @@ func TestBuildPyFuncEnsemblerJobImage(t *testing.T) {
235236
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
236237
artifactServiceMock.On("GetURLScheme").Return("gs")
237238
artifactServiceMock.On("GetURLScheme").Return("gs")
238-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
239+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
240+
Return([]byte(testCondaEnvContent), nil)
239241
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
240242
},
241243
},
@@ -328,7 +330,8 @@ func TestBuildPyFuncEnsemblerJobImage(t *testing.T) {
328330
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
329331
artifactServiceMock.On("GetURLScheme").Return("gs")
330332
artifactServiceMock.On("GetURLScheme").Return("gs")
331-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
333+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
334+
Return([]byte(testCondaEnvContent), nil)
332335
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
333336
},
334337
},
@@ -471,7 +474,8 @@ func TestBuildPyFuncEnsemblerServiceImage(t *testing.T) {
471474
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
472475
artifactServiceMock.On("GetURLScheme").Return("gs")
473476
artifactServiceMock.On("GetURLScheme").Return("gs")
474-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
477+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
478+
Return([]byte(testCondaEnvContent), nil)
475479
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
476480
},
477481
},
@@ -540,7 +544,8 @@ func TestBuildPyFuncEnsemblerServiceImage(t *testing.T) {
540544
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
541545
artifactServiceMock.On("GetURLScheme").Return("gs")
542546
artifactServiceMock.On("GetURLScheme").Return("gs")
543-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
547+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
548+
Return([]byte(testCondaEnvContent), nil)
544549
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
545550
},
546551
},
@@ -633,7 +638,8 @@ func TestBuildPyFuncEnsemblerServiceImage(t *testing.T) {
633638
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
634639
artifactServiceMock.On("GetURLScheme").Return("gs")
635640
artifactServiceMock.On("GetURLScheme").Return("gs")
636-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
641+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
642+
Return([]byte(testCondaEnvContent), nil)
637643
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
638644
},
639645
},
@@ -671,7 +677,8 @@ func TestBuildPyFuncEnsemblerServiceImage(t *testing.T) {
671677
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
672678
artifactServiceMock.On("GetURLScheme").Return("gs")
673679
artifactServiceMock.On("GetURLScheme").Return("gs")
674-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
680+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
681+
Return([]byte(testCondaEnvContent), nil)
675682
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
676683
},
677684
},
@@ -852,7 +859,8 @@ func TestGetEnsemblerJobImageBuildingJobStatus(t *testing.T) {
852859
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
853860
artifactServiceMock.On("GetURLScheme").Return("gs")
854861
artifactServiceMock.On("GetURLScheme").Return("gs")
855-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
862+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
863+
Return([]byte(testCondaEnvContent), nil)
856864
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
857865
},
858866
},
@@ -879,7 +887,8 @@ func TestGetEnsemblerJobImageBuildingJobStatus(t *testing.T) {
879887
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
880888
artifactServiceMock.On("GetURLScheme").Return("gs")
881889
artifactServiceMock.On("GetURLScheme").Return("gs")
882-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
890+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
891+
Return([]byte(testCondaEnvContent), nil)
883892
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
884893
},
885894
},
@@ -967,7 +976,8 @@ CondaEnvException: Pip failed`,
967976
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
968977
artifactServiceMock.On("GetURLScheme").Return("gs")
969978
artifactServiceMock.On("GetURLScheme").Return("gs")
970-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
979+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
980+
Return([]byte(testCondaEnvContent), nil)
971981
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
972982
},
973983
},
@@ -996,7 +1006,8 @@ CondaEnvException: Pip failed`,
9961006
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
9971007
artifactServiceMock.On("GetURLScheme").Return("gs")
9981008
artifactServiceMock.On("GetURLScheme").Return("gs")
999-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1009+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1010+
Return([]byte(testCondaEnvContent), nil)
10001011
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
10011012
},
10021013
},
@@ -1020,7 +1031,8 @@ CondaEnvException: Pip failed`,
10201031
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
10211032
artifactServiceMock.On("GetURLScheme").Return("gs")
10221033
artifactServiceMock.On("GetURLScheme").Return("gs")
1023-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1034+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1035+
Return([]byte(testCondaEnvContent), nil)
10241036
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
10251037
},
10261038
},
@@ -1098,7 +1110,8 @@ func TestGetEnsemblerServiceImageBuildingJobStatus(t *testing.T) {
10981110
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
10991111
artifactServiceMock.On("GetURLScheme").Return("gs")
11001112
artifactServiceMock.On("GetURLScheme").Return("gs")
1101-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1113+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1114+
Return([]byte(testCondaEnvContent), nil)
11021115
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
11031116
},
11041117
},
@@ -1125,7 +1138,8 @@ func TestGetEnsemblerServiceImageBuildingJobStatus(t *testing.T) {
11251138
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
11261139
artifactServiceMock.On("GetURLScheme").Return("gs")
11271140
artifactServiceMock.On("GetURLScheme").Return("gs")
1128-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1141+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1142+
Return([]byte(testCondaEnvContent), nil)
11291143
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
11301144
},
11311145
},
@@ -1181,7 +1195,8 @@ func TestGetEnsemblerServiceImageBuildingJobStatus(t *testing.T) {
11811195
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
11821196
artifactServiceMock.On("GetURLScheme").Return("gs")
11831197
artifactServiceMock.On("GetURLScheme").Return("gs")
1184-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1198+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1199+
Return([]byte(testCondaEnvContent), nil)
11851200
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
11861201
},
11871202
},
@@ -1233,7 +1248,8 @@ func TestGetEnsemblerServiceImageBuildingJobStatus(t *testing.T) {
12331248
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
12341249
artifactServiceMock.On("GetURLScheme").Return("gs")
12351250
artifactServiceMock.On("GetURLScheme").Return("gs")
1236-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1251+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1252+
Return([]byte(testCondaEnvContent), nil)
12371253
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
12381254
},
12391255
},
@@ -1280,7 +1296,8 @@ func TestGetEnsemblerServiceImageBuildingJobStatus(t *testing.T) {
12801296
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
12811297
artifactServiceMock.On("GetURLScheme").Return("gs")
12821298
artifactServiceMock.On("GetURLScheme").Return("gs")
1283-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1299+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1300+
Return([]byte(testCondaEnvContent), nil)
12841301
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
12851302
},
12861303
},
@@ -1355,7 +1372,8 @@ func TestDeleteEnsemblerJobImageBuildingJob(t *testing.T) {
13551372
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
13561373
artifactServiceMock.On("GetURLScheme").Return("gs")
13571374
artifactServiceMock.On("GetURLScheme").Return("gs")
1358-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1375+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1376+
Return([]byte(testCondaEnvContent), nil)
13591377
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
13601378
},
13611379
},
@@ -1434,7 +1452,8 @@ func TestDeleteEnsemblerServiceImageBuildingJob(t *testing.T) {
14341452
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
14351453
artifactServiceMock.On("GetURLScheme").Return("gs")
14361454
artifactServiceMock.On("GetURLScheme").Return("gs")
1437-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1455+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1456+
Return([]byte(testCondaEnvContent), nil)
14381457
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
14391458
},
14401459
},
@@ -1485,7 +1504,8 @@ func Test_imageBuilder_getHashedModelDependenciesUrl(t *testing.T) {
14851504
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
14861505
artifactServiceMock.On("GetURLScheme").Return("gs")
14871506
artifactServiceMock.On("GetURLScheme").Return("gs")
1488-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1507+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1508+
Return([]byte(testCondaEnvContent), nil)
14891509
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return([]byte(testCondaEnvContent), nil)
14901510
},
14911511
want: modelDependenciesURL,
@@ -1501,9 +1521,11 @@ func Test_imageBuilder_getHashedModelDependenciesUrl(t *testing.T) {
15011521
artifactServiceMock.On("ParseURL", fmt.Sprintf("gs%s", testArtifactURISuffix)).Return(testArtifactGsutilURL, nil)
15021522
artifactServiceMock.On("GetURLScheme").Return("gs")
15031523
artifactServiceMock.On("GetURLScheme").Return("gs")
1504-
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).Return([]byte(testCondaEnvContent), nil)
1524+
artifactServiceMock.On("ReadArtifact", mock.Anything, fmt.Sprintf("gs%s", testCondaEnvUrlSuffix)).
1525+
Return([]byte(testCondaEnvContent), nil)
15051526
artifactServiceMock.On("ReadArtifact", mock.Anything, modelDependenciesURL).Return(nil, artifact.ErrObjectNotExist)
1506-
artifactServiceMock.On("WriteArtifact", mock.Anything, modelDependenciesURL, []byte(testCondaEnvContent)).Return(nil)
1527+
artifactServiceMock.On("WriteArtifact", mock.Anything, modelDependenciesURL, []byte(testCondaEnvContent)).
1528+
Return(nil)
15071529
},
15081530
want: modelDependenciesURL,
15091531
wantErr: false,

0 commit comments

Comments
 (0)