Rename ExtractBase to FeatureFlagExtractBase

app/uploaders/object_storage.rb

@@ -187,7 +187,7 @@ module ObjectStorage
             hash[:TempPath] = workhorse_local_upload_path
           end
 
-          hash[:ExtractBase] = Feature.enabled?(:workhorse_extract_filename_base)
+          hash[:FeatureFlagExtractBase] = Feature.enabled?(:workhorse_extract_filename_base)
           hash[:MaximumSize] = maximum_size if maximum_size.present?
         end
       end

spec/uploaders/object_storage_spec.rb

@@ -443,7 +443,7 @@ RSpec.describe ObjectStorage do
 
     shared_examples 'extracts base filename' do
       it "returns true for ExtractsBase" do
-        expect(subject[:ExtractBase]).to be true
+        expect(subject[:FeatureFlagExtractBase]).to be true
       end
 
       context 'when workhorse_extract_filename_base is disabled' do
@@ -452,7 +452,7 @@ RSpec.describe ObjectStorage do
         end
 
         it "returns false for ExtractsBase" do
-          expect(subject[:ExtractBase]).to be false
+          expect(subject[:FeatureFlagExtractBase]).to be false
         end
       end
     end

workhorse/internal/api/api.go

@@ -150,7 +150,7 @@ type Response struct {
 	// The maximum accepted size in bytes of the upload
 	MaximumSize int64
 	// Feature flag used to determine whether to strip the multipart filename of any directories
-	ExtractBase bool
+	FeatureFlagExtractBase bool
 }
 
 // singleJoiningSlash is taken from reverseproxy.go:singleJoiningSlash

workhorse/internal/filestore/save_file_opts.go

@@ -63,8 +63,8 @@ type SaveFileOpts struct {
 	PresignedCompleteMultipart string
 	// PresignedAbortMultipart is a presigned URL for AbortMultipartUpload
 	PresignedAbortMultipart string
-	// ExtractBase uses the base of the filename and strips directories
-	ExtractBase bool
+	// FeatureFlagExtractBase uses the base of the filename and strips directories
+	FeatureFlagExtractBase bool
 }
 
 // UseWorkhorseClientEnabled checks if the options require direct access to object storage
@@ -90,17 +90,17 @@ func GetOpts(apiResponse *api.Response) (*SaveFileOpts, error) {
 	}
 
 	opts := SaveFileOpts{
-		ExtractBase:        apiResponse.ExtractBase,
-		LocalTempPath:      apiResponse.TempPath,
-		RemoteID:           apiResponse.RemoteObject.ID,
-		RemoteURL:          apiResponse.RemoteObject.GetURL,
-		PresignedPut:       apiResponse.RemoteObject.StoreURL,
-		PresignedDelete:    apiResponse.RemoteObject.DeleteURL,
-		PutHeaders:         apiResponse.RemoteObject.PutHeaders,
-		UseWorkhorseClient: apiResponse.RemoteObject.UseWorkhorseClient,
-		RemoteTempObjectID: apiResponse.RemoteObject.RemoteTempObjectID,
-		Deadline:           time.Now().Add(timeout),
-		MaximumSize:        apiResponse.MaximumSize,
+		FeatureFlagExtractBase: apiResponse.FeatureFlagExtractBase,
+		LocalTempPath:          apiResponse.TempPath,
+		RemoteID:               apiResponse.RemoteObject.ID,
+		RemoteURL:              apiResponse.RemoteObject.GetURL,
+		PresignedPut:           apiResponse.RemoteObject.StoreURL,
+		PresignedDelete:        apiResponse.RemoteObject.DeleteURL,
+		PutHeaders:             apiResponse.RemoteObject.PutHeaders,
+		UseWorkhorseClient:     apiResponse.RemoteObject.UseWorkhorseClient,
+		RemoteTempObjectID:     apiResponse.RemoteObject.RemoteTempObjectID,
+		Deadline:               time.Now().Add(timeout),
+		MaximumSize:            apiResponse.MaximumSize,
 	}
 
 	if opts.LocalTempPath != "" && opts.RemoteID != "" {

workhorse/internal/filestore/save_file_opts_test.go

@@ -57,18 +57,18 @@ func TestSaveFileOptsLocalAndRemote(t *testing.T) {
 
 func TestGetOpts(t *testing.T) {
 	tests := []struct {
-		name             string
-		multipart        *api.MultipartUploadParams
-		customPutHeaders bool
-		putHeaders       map[string]string
-		extractBase      bool
+		name                   string
+		multipart              *api.MultipartUploadParams
+		customPutHeaders       bool
+		putHeaders             map[string]string
+		FeatureFlagExtractBase bool
 	}{
 		{
 			name: "Single upload",
 		},
 		{
-			name:        "Single upload w/ extractBase enabled",
-			extractBase: true,
+			name:                   "Single upload w/ FeatureFlagExtractBase enabled",
+			FeatureFlagExtractBase: true,
 		}, {
 			name: "Multipart upload",
 			multipart: &api.MultipartUploadParams{
@@ -98,7 +98,7 @@ func TestGetOpts(t *testing.T) {
 	for _, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			apiResponse := &api.Response{
-				ExtractBase: test.extractBase,
+				FeatureFlagExtractBase: test.FeatureFlagExtractBase,
 				RemoteObject: api.RemoteObject{
 					Timeout:          10,
 					ID:               "id",
@@ -114,7 +114,7 @@ func TestGetOpts(t *testing.T) {
 			opts, err := filestore.GetOpts(apiResponse)
 			require.NoError(t, err)
 
-			require.Equal(t, apiResponse.ExtractBase, opts.ExtractBase)
+			require.Equal(t, apiResponse.FeatureFlagExtractBase, opts.FeatureFlagExtractBase)
 			require.Equal(t, apiResponse.TempPath, opts.LocalTempPath)
 			require.WithinDuration(t, deadline, opts.Deadline, time.Second)
 			require.Equal(t, apiResponse.RemoteObject.ID, opts.RemoteID)

workhorse/internal/upload/rewrite.go

@@ -115,7 +115,7 @@ func (rew *rewriter) handleFilePart(ctx context.Context, name string, p *multipa
 
 	filename := p.FileName()
 
-	if opts.ExtractBase {
+	if opts.FeatureFlagExtractBase {
 		filename = filepath.Base(filename)
 	}
 

workhorse/internal/upload/uploads_test.go

@@ -325,10 +325,10 @@ func TestInvalidFileNames(t *testing.T) {
 	defer os.RemoveAll(tempPath)
 
 	for _, testCase := range []struct {
-		filename       string
-		code           int
-		extractBase    bool
-		expectedPrefix string
+		filename               string
+		code                   int
+		FeatureFlagExtractBase bool
+		expectedPrefix         string
 	}{
 		{"foobar", 200, false, "foobar"}, // sanity check for test setup below
 		{"foo/bar", 500, false, ""},
@@ -356,7 +356,7 @@ func TestInvalidFileNames(t *testing.T) {
 		apiResponse := &api.Response{TempPath: tempPath}
 		preparer := &DefaultPreparer{}
 		opts, _, err := preparer.Prepare(apiResponse)
-		opts.ExtractBase = testCase.extractBase
+		opts.FeatureFlagExtractBase = testCase.FeatureFlagExtractBase
 		require.NoError(t, err)
 
 		HandleFileUploads(response, httpRequest, nilHandler, apiResponse, &SavedFileTracker{Request: httpRequest}, opts)