Merge branch 'pb-set-random-colleration-id-uploadarchive-test' into 'main'

Set random correlation ID in uploadarchive test

See merge request https://gitlab.com/gitlab-org/gitlab-shell/-/merge_requests/955



Merged-by: Ash McKenzie <amckenzie@gitlab.com>
Approved-by: Ash McKenzie <amckenzie@gitlab.com>
Co-authored-by: Patrick Bajao <ebajao@gitlab.com>

internal/command/uploadarchive/gitalycall_test.go

@@ -53,7 +53,8 @@ func TestUploadArchive(t *testing.T) {
 				ReadWriter: &readwriter.ReadWriter{ErrOut: output, Out: output, In: input},
 			}
 
-			ctx := correlation.ContextWithCorrelation(context.Background(), "a-correlation-id")
+			correlationID := correlation.SafeRandomID()
+			ctx := correlation.ContextWithCorrelation(context.Background(), correlationID)
 			ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests")
 
 			_, err := cmd.Execute(ctx)
@@ -75,7 +76,7 @@ func TestUploadArchive(t *testing.T) {
 				require.Equal(t, v, actual[0])
 			}
 			require.Empty(t, testServer.ReceivedMD["some-other-ff"])
-			require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], "a-correlation-id")
+			require.Equal(t, testServer.ReceivedMD["x-gitlab-correlation-id"][0], correlationID)
 		})
 	}
 }

internal/command/uploadarchive/uploadarchive_test.go

@@ -6,6 +6,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/require"
+	"gitlab.com/gitlab-org/labkit/correlation"
 
 	"gitlab.com/gitlab-org/gitlab-shell/v14/client/testserver"
 	"gitlab.com/gitlab-org/gitlab-shell/v14/internal/command"
@@ -21,7 +22,10 @@ func TestAllowedAccess(t *testing.T) {
 	cmd, _ := setup(t, "1", requests)
 	cmd.Config.GitalyClient.InitSidechannelRegistry(context.Background())
 
-	ctxWithLogData, err := cmd.Execute(context.Background())
+	correlationID := correlation.SafeRandomID()
+	ctx := correlation.ContextWithCorrelation(context.Background(), correlationID)
+	ctx = correlation.ContextWithClientName(ctx, "gitlab-shell-tests")
+	ctxWithLogData, err := cmd.Execute(ctx)
 	require.NoError(t, err)
 
 	data := ctxWithLogData.Value("logData").(command.LogData)