@@ -33,6 +33,13 @@ func TestCreateAndDeleteWorkspaceFromWorkspace(t *testing.T) {
3333 t .Fatalf ("Error creating workspace: %v" , err )
3434 }
3535
36+ t .Cleanup (func () {
37+ err = g .DeleteWorkspace (context .Background (), id )
38+ if err != nil {
39+ t .Errorf ("Error deleting workspace: %v" , err )
40+ }
41+ })
42+
3643 err = g .WriteFileInWorkspace (context .Background (), "file.txt" , []byte ("hello world" ), WriteFileInWorkspaceOptions {
3744 WorkspaceID : id ,
3845 })
@@ -45,26 +52,21 @@ func TestCreateAndDeleteWorkspaceFromWorkspace(t *testing.T) {
4552 t .Errorf ("Error creating workspace from workspace: %v" , err )
4653 }
4754
48- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
55+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
4956 WorkspaceID : newID ,
5057 })
5158 if err != nil {
52- t .Errorf ("Error reading file: %v" , err )
59+ t .Fatalf ("Error reading file: %v" , err )
5360 }
5461
55- if ! bytes .Equal (data , []byte ("hello world" )) {
56- t .Errorf ("Unexpected content: %s" , data )
62+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
63+ t .Errorf ("Unexpected content: %s" , content . Content )
5764 }
5865
5966 err = g .DeleteWorkspace (context .Background (), id )
6067 if err != nil {
6168 t .Errorf ("Error deleting workspace: %v" , err )
6269 }
63-
64- err = g .DeleteWorkspace (context .Background (), newID )
65- if err != nil {
66- t .Errorf ("Error deleting new workspace: %v" , err )
67- }
6870}
6971
7072func TestWriteReadAndDeleteFileFromWorkspace (t * testing.T ) {
@@ -90,8 +92,26 @@ func TestWriteReadAndDeleteFileFromWorkspace(t *testing.T) {
9092 t .Errorf ("Error reading file: %v" , err )
9193 }
9294
93- if ! bytes .Equal (content , []byte ("test" )) {
94- t .Errorf ("Unexpected content: %s" , content )
95+ if ! bytes .Equal (content .Content , []byte ("test" )) {
96+ t .Errorf ("Unexpected content: %s" , content .Content )
97+ }
98+
99+ if content .RevisionID != "" {
100+ t .Errorf ("Unexpected file revision ID when not requesting it: %s" , content .RevisionID )
101+ }
102+
103+ // Read the file and request the revision ID
104+ content , err = g .ReadFileInWorkspace (context .Background (), "test.txt" , ReadFileInWorkspaceOptions {WorkspaceID : id , WithLatestRevisionID : true })
105+ if err != nil {
106+ t .Errorf ("Error reading file: %v" , err )
107+ }
108+
109+ if ! bytes .Equal (content .Content , []byte ("test" )) {
110+ t .Errorf ("Unexpected content: %s" , content .Content )
111+ }
112+
113+ if content .RevisionID == "" {
114+ t .Errorf ("Expected file revision ID when requesting it: %s" , content .RevisionID )
95115 }
96116
97117 // Stat the file to ensure it exists
@@ -120,6 +140,24 @@ func TestWriteReadAndDeleteFileFromWorkspace(t *testing.T) {
120140 t .Errorf ("Unexpected file mime type: %s" , fileInfo .MimeType )
121141 }
122142
143+ if fileInfo .RevisionID != "" {
144+ t .Errorf ("Unexpected file revision ID when not requesting it: %s" , fileInfo .RevisionID )
145+ }
146+
147+ // Stat file and request the revision ID
148+ fileInfo , err = g .StatFileInWorkspace (context .Background (), "test.txt" , StatFileInWorkspaceOptions {WorkspaceID : id , WithLatestRevisionID : true })
149+ if err != nil {
150+ t .Errorf ("Error statting file: %v" , err )
151+ }
152+
153+ if fileInfo .WorkspaceID != id {
154+ t .Errorf ("Unexpected file workspace ID: %v" , fileInfo .WorkspaceID )
155+ }
156+
157+ if fileInfo .RevisionID == "" {
158+ t .Errorf ("Expected file revision ID when requesting it: %s" , fileInfo .RevisionID )
159+ }
160+
123161 // Ensure we get the error we expect when trying to read a non-existent file
124162 _ , err = g .ReadFileInWorkspace (context .Background (), "test1.txt" , ReadFileInWorkspaceOptions {WorkspaceID : id })
125163 if nf := (* NotFoundInWorkspaceError )(nil ); ! errors .As (err , & nf ) {
@@ -322,7 +360,7 @@ func TestConflictsForFileInWorkspace(t *testing.T) {
322360
323361 ce := (* ConflictInWorkspaceError )(nil )
324362 // Writing a new file with a non-zero latest revision should fail
325- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test0" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : "1" })
363+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test0" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : "1" })
326364 if err == nil || ! errors .As (err , & ce ) {
327365 t .Errorf ("Expected error writing file with non-zero latest revision: %v" , err )
328366 }
@@ -347,7 +385,7 @@ func TestConflictsForFileInWorkspace(t *testing.T) {
347385 }
348386
349387 // Writing to the file with the latest revision should succeed
350- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test2" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : revisions [0 ].RevisionID })
388+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test2" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
351389 if err != nil {
352390 t .Fatalf ("Error creating file: %v" , err )
353391 }
@@ -362,12 +400,13 @@ func TestConflictsForFileInWorkspace(t *testing.T) {
362400 }
363401
364402 // Writing to the file with the same revision should fail
365- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test3" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : revisions [0 ].RevisionID })
403+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test3" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
366404 if err == nil || ! errors .As (err , & ce ) {
367405 t .Errorf ("Expected error writing file with same revision: %v" , err )
368406 }
369407
370- err = g .DeleteRevisionForFileInWorkspace (context .Background (), "test.txt" , revisions [1 ].RevisionID , DeleteRevisionForFileInWorkspaceOptions {WorkspaceID : id })
408+ latestRevisionID := revisions [1 ].RevisionID
409+ err = g .DeleteRevisionForFileInWorkspace (context .Background (), "test.txt" , latestRevisionID , DeleteRevisionForFileInWorkspaceOptions {WorkspaceID : id })
371410 if err != nil {
372411 t .Errorf ("Error deleting revision for file: %v" , err )
373412 }
@@ -381,10 +420,16 @@ func TestConflictsForFileInWorkspace(t *testing.T) {
381420 t .Errorf ("Unexpected number of revisions: %d" , len (revisions ))
382421 }
383422
423+ // Ensure we cannot write a new file with the zero-th revision ID
424+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
425+ if err == nil || ! errors .As (err , & ce ) {
426+ t .Errorf ("Unexpected error writing to file: %v" , err )
427+ }
428+
384429 // Ensure we can write a new file after deleting the latest revision
385- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : revisions [ 0 ]. RevisionID })
430+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : latestRevisionID })
386431 if err != nil {
387- t .Fatalf ("Error creating file: %v" , err )
432+ t .Errorf ("Error writing file: %v" , err )
388433 }
389434
390435 err = g .DeleteFileInWorkspace (context .Background (), "test.txt" , DeleteFileInWorkspaceOptions {WorkspaceID : id })
@@ -501,15 +546,15 @@ func TestCreateAndDeleteWorkspaceFromWorkspaceS3(t *testing.T) {
501546 t .Errorf ("Error creating workspace from workspace: %v" , err )
502547 }
503548
504- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
549+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
505550 WorkspaceID : newID ,
506551 })
507552 if err != nil {
508553 t .Errorf ("Error reading file: %v" , err )
509554 }
510555
511- if ! bytes .Equal (data , []byte ("hello world" )) {
512- t .Errorf ("Unexpected content: %s" , data )
556+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
557+ t .Errorf ("Unexpected content: %s" , content . Content )
513558 }
514559
515560 err = g .DeleteWorkspace (context .Background (), id )
@@ -545,15 +590,15 @@ func TestCreateAndDeleteDirectoryWorkspaceFromWorkspaceS3(t *testing.T) {
545590 t .Errorf ("Error creating workspace from workspace: %v" , err )
546591 }
547592
548- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
593+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
549594 WorkspaceID : newID ,
550595 })
551596 if err != nil {
552597 t .Errorf ("Error reading file: %v" , err )
553598 }
554599
555- if ! bytes .Equal (data , []byte ("hello world" )) {
556- t .Errorf ("Unexpected content: %s" , data )
600+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
601+ t .Errorf ("Unexpected content: %s" , content . Content )
557602 }
558603
559604 err = g .DeleteWorkspace (context .Background (), id )
@@ -577,6 +622,13 @@ func TestCreateAndDeleteS3WorkspaceFromWorkspaceDirectory(t *testing.T) {
577622 t .Fatalf ("Error creating workspace: %v" , err )
578623 }
579624
625+ t .Cleanup (func () {
626+ err = g .DeleteWorkspace (context .Background (), id )
627+ if err != nil {
628+ t .Errorf ("Error deleting workspace: %v" , err )
629+ }
630+ })
631+
580632 err = g .WriteFileInWorkspace (context .Background (), "file.txt" , []byte ("hello world" ), WriteFileInWorkspaceOptions {
581633 WorkspaceID : id ,
582634 })
@@ -589,26 +641,21 @@ func TestCreateAndDeleteS3WorkspaceFromWorkspaceDirectory(t *testing.T) {
589641 t .Errorf ("Error creating workspace from workspace: %v" , err )
590642 }
591643
592- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
644+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
593645 WorkspaceID : newID ,
594646 })
595647 if err != nil {
596- t .Errorf ("Error reading file: %v" , err )
648+ t .Fatalf ("Error reading file: %v" , err )
597649 }
598650
599- if ! bytes .Equal (data , []byte ("hello world" )) {
600- t .Errorf ("Unexpected content: %s" , data )
651+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
652+ t .Errorf ("Unexpected content: %s" , content . Content )
601653 }
602654
603655 err = g .DeleteWorkspace (context .Background (), id )
604656 if err != nil {
605657 t .Errorf ("Error deleting workspace: %v" , err )
606658 }
607-
608- err = g .DeleteWorkspace (context .Background (), newID )
609- if err != nil {
610- t .Errorf ("Error deleting new workspace: %v" , err )
611- }
612659}
613660
614661func TestWriteReadAndDeleteFileFromWorkspaceS3 (t * testing.T ) {
@@ -638,8 +685,26 @@ func TestWriteReadAndDeleteFileFromWorkspaceS3(t *testing.T) {
638685 t .Errorf ("Error reading file: %v" , err )
639686 }
640687
641- if ! bytes .Equal (content , []byte ("test" )) {
642- t .Errorf ("Unexpected content: %s" , content )
688+ if ! bytes .Equal (content .Content , []byte ("test" )) {
689+ t .Errorf ("Unexpected content: %s" , content .Content )
690+ }
691+
692+ if content .RevisionID != "" {
693+ t .Errorf ("Unexpected file revision ID when not requesting it: %s" , content .RevisionID )
694+ }
695+
696+ // Read the file and request the revision ID
697+ content , err = g .ReadFileInWorkspace (context .Background (), "test.txt" , ReadFileInWorkspaceOptions {WorkspaceID : id , WithLatestRevisionID : true })
698+ if err != nil {
699+ t .Errorf ("Error reading file: %v" , err )
700+ }
701+
702+ if ! bytes .Equal (content .Content , []byte ("test" )) {
703+ t .Errorf ("Unexpected content: %s" , content .Content )
704+ }
705+
706+ if content .RevisionID == "" {
707+ t .Errorf ("Expected file revision ID when requesting it: %s" , content .RevisionID )
643708 }
644709
645710 // Stat the file to ensure it exists
@@ -668,6 +733,24 @@ func TestWriteReadAndDeleteFileFromWorkspaceS3(t *testing.T) {
668733 t .Errorf ("Unexpected file mime type: %s" , fileInfo .MimeType )
669734 }
670735
736+ if fileInfo .RevisionID != "" {
737+ t .Errorf ("Unexpected file revision ID when not requesting it: %s" , fileInfo .RevisionID )
738+ }
739+
740+ // Stat file and request the revision ID
741+ fileInfo , err = g .StatFileInWorkspace (context .Background (), "test.txt" , StatFileInWorkspaceOptions {WorkspaceID : id , WithLatestRevisionID : true })
742+ if err != nil {
743+ t .Errorf ("Error statting file: %v" , err )
744+ }
745+
746+ if fileInfo .WorkspaceID != id {
747+ t .Errorf ("Unexpected file workspace ID: %v" , fileInfo .WorkspaceID )
748+ }
749+
750+ if fileInfo .RevisionID == "" {
751+ t .Errorf ("Expected file revision ID when requesting it: %s" , fileInfo .RevisionID )
752+ }
753+
671754 // Ensure we get the error we expect when trying to read a non-existent file
672755 _ , err = g .ReadFileInWorkspace (context .Background (), "test1.txt" , ReadFileInWorkspaceOptions {WorkspaceID : id })
673756 if nf := (* NotFoundInWorkspaceError )(nil ); ! errors .As (err , & nf ) {
@@ -795,7 +878,7 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
795878
796879 ce := (* ConflictInWorkspaceError )(nil )
797880 // Writing a new file with a non-zero latest revision should fail
798- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test0" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : "1" })
881+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test0" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : "1" })
799882 if err == nil || ! errors .As (err , & ce ) {
800883 t .Errorf ("Expected error writing file with non-zero latest revision: %v" , err )
801884 }
@@ -820,7 +903,7 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
820903 }
821904
822905 // Writing to the file with the latest revision should succeed
823- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test2" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : revisions [0 ].RevisionID })
906+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test2" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
824907 if err != nil {
825908 t .Fatalf ("Error creating file: %v" , err )
826909 }
@@ -835,12 +918,13 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
835918 }
836919
837920 // Writing to the file with the same revision should fail
838- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test3" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : revisions [0 ].RevisionID })
921+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test3" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
839922 if err == nil || ! errors .As (err , & ce ) {
840923 t .Errorf ("Expected error writing file with same revision: %v" , err )
841924 }
842925
843- err = g .DeleteRevisionForFileInWorkspace (context .Background (), "test.txt" , revisions [1 ].RevisionID , DeleteRevisionForFileInWorkspaceOptions {WorkspaceID : id })
926+ latestRevisionID := revisions [1 ].RevisionID
927+ err = g .DeleteRevisionForFileInWorkspace (context .Background (), "test.txt" , latestRevisionID , DeleteRevisionForFileInWorkspaceOptions {WorkspaceID : id })
844928 if err != nil {
845929 t .Errorf ("Error deleting revision for file: %v" , err )
846930 }
@@ -854,8 +938,14 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
854938 t .Errorf ("Unexpected number of revisions: %d" , len (revisions ))
855939 }
856940
941+ // Ensure we cannot write a new file with the zero-th revision ID
942+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
943+ if err == nil || ! errors .As (err , & ce ) {
944+ t .Fatalf ("Error creating file: %v" , err )
945+ }
946+
857947 // Ensure we can write a new file after deleting the latest revision
858- err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevision : revisions [ 0 ]. RevisionID })
948+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : latestRevisionID })
859949 if err != nil {
860950 t .Fatalf ("Error creating file: %v" , err )
861951 }
0 commit comments