@@ -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,7 +400,7 @@ 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 }
@@ -382,7 +420,7 @@ func TestConflictsForFileInWorkspace(t *testing.T) {
382420 }
383421
384422 // 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 })
423+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
386424 if err != nil {
387425 t .Fatalf ("Error creating file: %v" , err )
388426 }
@@ -501,15 +539,15 @@ func TestCreateAndDeleteWorkspaceFromWorkspaceS3(t *testing.T) {
501539 t .Errorf ("Error creating workspace from workspace: %v" , err )
502540 }
503541
504- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
542+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
505543 WorkspaceID : newID ,
506544 })
507545 if err != nil {
508546 t .Errorf ("Error reading file: %v" , err )
509547 }
510548
511- if ! bytes .Equal (data , []byte ("hello world" )) {
512- t .Errorf ("Unexpected content: %s" , data )
549+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
550+ t .Errorf ("Unexpected content: %s" , content . Content )
513551 }
514552
515553 err = g .DeleteWorkspace (context .Background (), id )
@@ -545,15 +583,15 @@ func TestCreateAndDeleteDirectoryWorkspaceFromWorkspaceS3(t *testing.T) {
545583 t .Errorf ("Error creating workspace from workspace: %v" , err )
546584 }
547585
548- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
586+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
549587 WorkspaceID : newID ,
550588 })
551589 if err != nil {
552590 t .Errorf ("Error reading file: %v" , err )
553591 }
554592
555- if ! bytes .Equal (data , []byte ("hello world" )) {
556- t .Errorf ("Unexpected content: %s" , data )
593+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
594+ t .Errorf ("Unexpected content: %s" , content . Content )
557595 }
558596
559597 err = g .DeleteWorkspace (context .Background (), id )
@@ -577,6 +615,13 @@ func TestCreateAndDeleteS3WorkspaceFromWorkspaceDirectory(t *testing.T) {
577615 t .Fatalf ("Error creating workspace: %v" , err )
578616 }
579617
618+ t .Cleanup (func () {
619+ err = g .DeleteWorkspace (context .Background (), id )
620+ if err != nil {
621+ t .Errorf ("Error deleting workspace: %v" , err )
622+ }
623+ })
624+
580625 err = g .WriteFileInWorkspace (context .Background (), "file.txt" , []byte ("hello world" ), WriteFileInWorkspaceOptions {
581626 WorkspaceID : id ,
582627 })
@@ -589,26 +634,21 @@ func TestCreateAndDeleteS3WorkspaceFromWorkspaceDirectory(t *testing.T) {
589634 t .Errorf ("Error creating workspace from workspace: %v" , err )
590635 }
591636
592- data , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
637+ content , err := g .ReadFileInWorkspace (context .Background (), "file.txt" , ReadFileInWorkspaceOptions {
593638 WorkspaceID : newID ,
594639 })
595640 if err != nil {
596- t .Errorf ("Error reading file: %v" , err )
641+ t .Fatalf ("Error reading file: %v" , err )
597642 }
598643
599- if ! bytes .Equal (data , []byte ("hello world" )) {
600- t .Errorf ("Unexpected content: %s" , data )
644+ if ! bytes .Equal (content . Content , []byte ("hello world" )) {
645+ t .Errorf ("Unexpected content: %s" , content . Content )
601646 }
602647
603648 err = g .DeleteWorkspace (context .Background (), id )
604649 if err != nil {
605650 t .Errorf ("Error deleting workspace: %v" , err )
606651 }
607-
608- err = g .DeleteWorkspace (context .Background (), newID )
609- if err != nil {
610- t .Errorf ("Error deleting new workspace: %v" , err )
611- }
612652}
613653
614654func TestWriteReadAndDeleteFileFromWorkspaceS3 (t * testing.T ) {
@@ -638,8 +678,26 @@ func TestWriteReadAndDeleteFileFromWorkspaceS3(t *testing.T) {
638678 t .Errorf ("Error reading file: %v" , err )
639679 }
640680
641- if ! bytes .Equal (content , []byte ("test" )) {
642- t .Errorf ("Unexpected content: %s" , content )
681+ if ! bytes .Equal (content .Content , []byte ("test" )) {
682+ t .Errorf ("Unexpected content: %s" , content .Content )
683+ }
684+
685+ if content .RevisionID != "" {
686+ t .Errorf ("Unexpected file revision ID when not requesting it: %s" , content .RevisionID )
687+ }
688+
689+ // Read the file and request the revision ID
690+ content , err = g .ReadFileInWorkspace (context .Background (), "test.txt" , ReadFileInWorkspaceOptions {WorkspaceID : id , WithLatestRevisionID : true })
691+ if err != nil {
692+ t .Errorf ("Error reading file: %v" , err )
693+ }
694+
695+ if ! bytes .Equal (content .Content , []byte ("test" )) {
696+ t .Errorf ("Unexpected content: %s" , content .Content )
697+ }
698+
699+ if content .RevisionID == "" {
700+ t .Errorf ("Expected file revision ID when requesting it: %s" , content .RevisionID )
643701 }
644702
645703 // Stat the file to ensure it exists
@@ -668,6 +726,24 @@ func TestWriteReadAndDeleteFileFromWorkspaceS3(t *testing.T) {
668726 t .Errorf ("Unexpected file mime type: %s" , fileInfo .MimeType )
669727 }
670728
729+ if fileInfo .RevisionID != "" {
730+ t .Errorf ("Unexpected file revision ID when not requesting it: %s" , fileInfo .RevisionID )
731+ }
732+
733+ // Stat file and request the revision ID
734+ fileInfo , err = g .StatFileInWorkspace (context .Background (), "test.txt" , StatFileInWorkspaceOptions {WorkspaceID : id , WithLatestRevisionID : true })
735+ if err != nil {
736+ t .Errorf ("Error statting file: %v" , err )
737+ }
738+
739+ if fileInfo .WorkspaceID != id {
740+ t .Errorf ("Unexpected file workspace ID: %v" , fileInfo .WorkspaceID )
741+ }
742+
743+ if fileInfo .RevisionID == "" {
744+ t .Errorf ("Expected file revision ID when requesting it: %s" , fileInfo .RevisionID )
745+ }
746+
671747 // Ensure we get the error we expect when trying to read a non-existent file
672748 _ , err = g .ReadFileInWorkspace (context .Background (), "test1.txt" , ReadFileInWorkspaceOptions {WorkspaceID : id })
673749 if nf := (* NotFoundInWorkspaceError )(nil ); ! errors .As (err , & nf ) {
@@ -795,7 +871,7 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
795871
796872 ce := (* ConflictInWorkspaceError )(nil )
797873 // 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" })
874+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test0" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : "1" })
799875 if err == nil || ! errors .As (err , & ce ) {
800876 t .Errorf ("Expected error writing file with non-zero latest revision: %v" , err )
801877 }
@@ -820,7 +896,7 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
820896 }
821897
822898 // 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 })
899+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test2" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
824900 if err != nil {
825901 t .Fatalf ("Error creating file: %v" , err )
826902 }
@@ -835,7 +911,7 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
835911 }
836912
837913 // 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 })
914+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test3" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
839915 if err == nil || ! errors .As (err , & ce ) {
840916 t .Errorf ("Expected error writing file with same revision: %v" , err )
841917 }
@@ -855,7 +931,7 @@ func TestConflictsForFileInWorkspaceS3(t *testing.T) {
855931 }
856932
857933 // 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 })
934+ err = g .WriteFileInWorkspace (context .Background (), "test.txt" , []byte ("test4" ), WriteFileInWorkspaceOptions {WorkspaceID : id , LatestRevisionID : revisions [0 ].RevisionID })
859935 if err != nil {
860936 t .Fatalf ("Error creating file: %v" , err )
861937 }
0 commit comments