Skip to content

Commit 92246d7

Browse files
matthewpeterkortmatthewpeterkort
committed
revert back to comment out logger
1 parent 08acca1 commit 92246d7

4 files changed

Lines changed: 55 additions & 55 deletions

File tree

‎client/g3cmd/configure.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,15 @@ func init() {
2828
// don't initialize transmission logs for non-uploading related commands
2929
logs.SetToBoth()
3030

31-
err := jwt.UpdateConfig(profile, apiEndpoint, credFile, fenceToken, useShepherd, minShepherdVersion)
31+
err := jwt.UpdateConfig(
32+
&jwt.Credential{
33+
Profile: profile,
34+
APIEndpoint: apiEndpoint,
35+
AccessToken: fenceToken,
36+
UseShepherd: useShepherd,
37+
MinShepherdVersion: minShepherdVersion,
38+
},
39+
)
3240
if err != nil {
3341
log.Println(err.Error())
3442
}

‎client/g3cmd/upload-multipart.go‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ var multipartUploadLock sync.Mutex
5959
// UploadSingleMultipart uploads a single file to Gen3 using the multipart upload strategy.
6060
// This is the preferred method for large files as it provides resilience through retries on a per-chunk basis.
6161
func UploadSingleMultipart(profile string, filePath string, bucketName string, guid string, enableLogs bool) error {
62-
//toggleable logs
62+
// Instantiate interface to Gen3
63+
//
6364
if !enableLogs {
6465
log.SetOutput(io.Discard)
6566
}
66-
// Instantiate interface to Gen3
6767
gen3Interface := NewGen3Interface()
6868

6969
// The profileConfig is used by underlying functions, so it must be parsed and set globally.
@@ -137,38 +137,39 @@ func multipartUpload(g3 Gen3Interface, furObject commonUtils.FileUploadRequestOb
137137
file, err := os.Open(furObject.FilePath)
138138
if err != nil {
139139
err = fmt.Errorf("FAILED multipart upload for %s due to file open error: %s", furObject.FilePath, err.Error())
140-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
140+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
141141
return err
142142
}
143143
defer file.Close()
144144

145145
fi, err := file.Stat()
146146
if err != nil {
147147
err = fmt.Errorf("FAILED multipart upload for %s: file stat error, file may be missing or unreadable because of permissions", furObject.Filename)
148-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
148+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
149149
return err
150150
}
151151
if fi.Size() == 0 {
152152
err = fmt.Errorf("FAILED multipart upload for %s: the file size must be greater than 0", fi.Name())
153-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
153+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
154154
return err
155155
}
156156
if fi.Size() > MultipartFileSizeLimit {
157157
err = fmt.Errorf("FAILED multipart upload for %s: the file size has exceeded the limit allowed and cannot be uploaded. The maximum allowed file size is %s", fi.Name(), FormatSize(MultipartFileSizeLimit))
158-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
158+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
159159
return err
160160
}
161161
// Use the refactored InitMultipartUpload with the unified object
162162
uploadID, guid, err := InitMultipartUpload(g3, furObject, bucketName)
163163
if err != nil {
164164
err = fmt.Errorf("FAILED multipart upload for %s: %s", furObject.Filename, err.Error())
165-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
165+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
166166
return err
167167
}
168168
// Update the FURObject's GUID with the one returned from Gen3 (in case it was newly generated)
169169
// We'll update the failed log with this GUID for consistency
170170
furObject.GUID = guid
171-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
171+
// haven't figured out a good way to ballance the loggers yet so just comment this out for now.
172+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
172173

173174
key := guid + "/" + furObject.Filename
174175
parts := []MultipartPartObject{}
@@ -193,7 +194,7 @@ func multipartUpload(g3 Gen3Interface, furObject commonUtils.FileUploadRequestOb
193194
return
194195
})
195196
if err != nil {
196-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, guid, retryCount, true, true)
197+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, guid, retryCount, true, true)
197198
continue
198199
}
199200

@@ -208,7 +209,7 @@ func multipartUpload(g3 Gen3Interface, furObject commonUtils.FileUploadRequestOb
208209
return
209210
})
210211
if err != nil {
211-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, guid, retryCount, true, true)
212+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, guid, retryCount, true, true)
212213
continue
213214
}
214215

@@ -236,7 +237,7 @@ func multipartUpload(g3 Gen3Interface, furObject commonUtils.FileUploadRequestOb
236237
return
237238
})
238239
if err != nil {
239-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, guid, retryCount, true, true)
240+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, guid, retryCount, true, true)
240241
continue
241242
}
242243

@@ -262,7 +263,7 @@ func multipartUpload(g3 Gen3Interface, furObject commonUtils.FileUploadRequestOb
262263
}
263264
if len(parts) != numOfChunks {
264265
err = fmt.Errorf("FAILED multipart upload for %s: Total number of received ETags doesn't match the total number of chunks", furObject.Filename)
265-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
266+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
266267
return err
267268
}
268269

@@ -272,12 +273,12 @@ func multipartUpload(g3 Gen3Interface, furObject commonUtils.FileUploadRequestOb
272273

273274
if err = CompleteMultipartUpload(g3, key, uploadID, parts, bucketName); err != nil {
274275
err = fmt.Errorf("FAILED multipart upload for %s: %s", furObject.Filename, err.Error())
275-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
276+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, true, true)
276277
return err
277278
}
278279

279280
// Successful upload cleanup
280-
logs.DeleteFromFailedLog(furObject.FilePath, true)
281-
logs.WriteToSucceededLog(furObject.FilePath, furObject.GUID, true)
281+
//logs.DeleteFromFailedLog(furObject.FilePath, true)
282+
//logs.WriteToSucceededLog(furObject.FilePath, furObject.GUID, true)
282283
return nil
283284
}

‎client/g3cmd/utils.go‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -431,42 +431,42 @@ func separateSingleAndMultipartUploads(objects []commonUtils.FileUploadRequestOb
431431

432432
// Check if file exists locally
433433
if _, err := os.Stat(filePath); os.IsNotExist(err) {
434-
log.Printf("The file you specified \"%s\" does not exist locally", filePath)
435-
logs.AddToFailedLog(object.FilePath, object.Filename, object.FileMetadata, object.GUID, 0, false, true)
434+
//log.Printf("The file you specified \"%s\" does not exist locally", filePath)
435+
//logs.AddToFailedLog(object.FilePath, object.Filename, object.FileMetadata, object.GUID, 0, false, true)
436436
continue
437437
}
438438

439439
// Use a closure to handle file operations and cleanup
440440
func(obj commonUtils.FileUploadRequestObject) {
441441
file, err := os.Open(filePath)
442442
if err != nil {
443-
log.Println("File open error occurred when validating file path: " + err.Error())
444-
logs.AddToFailedLog(obj.FilePath, obj.Filename, obj.FileMetadata, obj.GUID, 0, false, true)
443+
//log.Println("File open error occurred when validating file path: " + err.Error())
444+
//logs.AddToFailedLog(obj.FilePath, obj.Filename, obj.FileMetadata, obj.GUID, 0, false, true)
445445
return
446446
}
447447
defer file.Close()
448448

449449
fi, err := file.Stat()
450450
if err != nil {
451-
log.Println("File stat error occurred when validating file path: " + err.Error())
452-
logs.AddToFailedLog(obj.FilePath, obj.Filename, obj.FileMetadata, obj.GUID, 0, false, true)
451+
//log.Println("File stat error occurred when validating file path: " + err.Error())
452+
//logs.AddToFailedLog(obj.FilePath, obj.Filename, obj.FileMetadata, obj.GUID, 0, false, true)
453453
return
454454
}
455455
if fi.IsDir() {
456456
return
457457
}
458458

459459
if logs.ExistsInSucceededLog(filePath) {
460-
log.Println("File \"" + filePath + "\" has been found in local submission history and has been skipped to prevent duplicated submissions.")
460+
//log.Println("File \"" + filePath + "\" has been found in local submission history and has been skipped to prevent duplicated submissions.")
461461
return
462462
}
463463

464464
// Add to failed log initially, it will be removed on success
465465
// This is an existing pattern, keeping it here.
466-
logs.AddToFailedLog(obj.FilePath, obj.Filename, obj.FileMetadata, obj.GUID, 0, false, true)
466+
//logs.AddToFailedLog(obj.FilePath, obj.Filename, obj.FileMetadata, obj.GUID, 0, false, true)
467467

468468
if fi.Size() > MultipartFileSizeLimit {
469-
log.Printf("The file size of %s has exceeded the limit allowed and cannot be uploaded. The maximum allowed file size is %s\n", fi.Name(), FormatSize(MultipartFileSizeLimit))
469+
//log.Printf("The file size of %s has exceeded the limit allowed and cannot be uploaded. The maximum allowed file size is %s\n", fi.Name(), FormatSize(MultipartFileSizeLimit))
470470
} else if fi.Size() > int64(fileSizeLimit) {
471471
multipartObjects = append(multipartObjects, obj)
472472
} else {
@@ -489,12 +489,12 @@ func ProcessFilename(uploadPath string, filePath string, objectId string, includ
489489
presentPath := strings.TrimSuffix(uploadPath, commonUtils.PathSeparator+"*")
490490
fileInfo, err := os.Stat(presentPath)
491491
if err != nil {
492-
log.Fatal(err)
492+
return commonUtils.FileUploadRequestObject{}, err
493493
}
494494
if !fileInfo.IsDir() {
495495
pwd, err := os.Getwd()
496496
if err != nil {
497-
log.Fatal(err)
497+
return commonUtils.FileUploadRequestObject{}, err
498498
}
499499
filename = strings.TrimPrefix(presentPath, pwd)
500500

@@ -519,7 +519,7 @@ func ProcessFilename(uploadPath string, filePath string, objectId string, includ
519519
}
520520
} else {
521521
// No metadata file was found for this file -- proceed, but warn the user.
522-
log.Printf("WARNING: File metadata is enabled, but could not find the metadata file %v for file %v. Execute `data-client upload --help` for more info on file metadata.\n", metadataFilePath, filePath)
522+
//log.Printf("WARNING: File metadata is enabled, but could not find the metadata file %v for file %v. Execute `data-client upload --help` for more info on file metadata.\n", metadataFilePath, filePath)
523523
}
524524
}
525525
return commonUtils.FileUploadRequestObject{FilePath: filePath, Filename: filename, FileMetadata: metadata, GUID: objectId}, err
@@ -557,19 +557,19 @@ func uploadFile(furObject commonUtils.FileUploadRequestObject, retryCount int) e
557557
client := &http.Client{}
558558
resp, err := client.Do(furObject.Request)
559559
if err != nil {
560-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, false, true)
560+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, false, true)
561561
furObject.Bar.Finish()
562562
return errors.New("Error occurred during upload: " + err.Error())
563563
}
564564
if resp.StatusCode != 200 {
565-
logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, false, true)
565+
//logs.AddToFailedLog(furObject.FilePath, furObject.Filename, furObject.FileMetadata, furObject.GUID, retryCount, false, true)
566566
furObject.Bar.Finish()
567567
return errors.New("Upload request got a non-200 response with status code " + strconv.Itoa(resp.StatusCode))
568568
}
569569
furObject.Bar.Finish()
570-
log.Printf("Successfully uploaded file \"%s\" to GUID %s.\n", furObject.FilePath, furObject.GUID)
571-
logs.DeleteFromFailedLog(furObject.FilePath, true)
572-
logs.WriteToSucceededLog(furObject.FilePath, furObject.GUID, false)
570+
//log.Printf("Successfully uploaded file \"%s\" to GUID %s.\n", furObject.FilePath, furObject.GUID)
571+
//logs.DeleteFromFailedLog(furObject.FilePath, true)
572+
//logs.WriteToSucceededLog(furObject.FilePath, furObject.GUID, false)
573573
return nil
574574
}
575575

‎client/jwt/update.go‎

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,29 +10,23 @@ import (
1010
"github.com/hashicorp/go-version"
1111
)
1212

13-
func UpdateConfig(profile string, apiEndpoint string, credFile string, fenceToken string, useShepherd string, minShepherdVersion string) error {
13+
func UpdateConfig(cred *Credential) error {
1414

1515
var conf Configure
1616
var req Request
1717

18-
profileConfig, err := conf.ReadCredentials(credFile, fenceToken)
19-
if err != nil {
20-
return err
21-
}
22-
23-
profileConfig.Profile = profile
24-
apiEndpoint = strings.TrimSpace(apiEndpoint)
25-
if apiEndpoint[len(apiEndpoint)-1:] == "/" {
26-
apiEndpoint = apiEndpoint[:len(apiEndpoint)-1]
18+
cred.APIEndpoint = strings.TrimSpace(cred.APIEndpoint)
19+
if cred.APIEndpoint[len(cred.APIEndpoint)-1:] == "/" {
20+
cred.APIEndpoint = cred.APIEndpoint[:len(cred.APIEndpoint)-1]
2721
}
28-
parsedURL, err := conf.ValidateUrl(apiEndpoint)
22+
parsedURL, err := conf.ValidateUrl(cred.APIEndpoint)
2923
if err != nil {
3024
return fmt.Errorf("Errr occurred when validating apiendpoint URL: %s", err.Error())
3125
}
3226

3327
prefixEndPoint := parsedURL.Scheme + "://" + parsedURL.Host
34-
if profileConfig.AccessToken == "" {
35-
err = req.RequestNewAccessToken(prefixEndPoint+commonUtils.FenceAccessTokenEndpoint, profileConfig)
28+
if cred.AccessToken == "" {
29+
err = req.RequestNewAccessToken(prefixEndPoint+commonUtils.FenceAccessTokenEndpoint, cred)
3630
if err != nil {
3731
receivedErrorString := err.Error()
3832
errorMessageString := receivedErrorString
@@ -44,25 +38,22 @@ func UpdateConfig(profile string, apiEndpoint string, credFile string, fenceToke
4438
return fmt.Errorf("Error occurred when validating profile config: %s", errorMessageString)
4539
}
4640
}
47-
profileConfig.APIEndpoint = apiEndpoint
4841

49-
useShepherd = strings.TrimSpace(useShepherd)
50-
profileConfig.UseShepherd = useShepherd
51-
minShepherdVersion = strings.TrimSpace(minShepherdVersion)
52-
if minShepherdVersion != "" {
53-
_, err = version.NewVersion(minShepherdVersion)
42+
cred.UseShepherd = strings.TrimSpace(cred.UseShepherd)
43+
cred.MinShepherdVersion = strings.TrimSpace(cred.MinShepherdVersion)
44+
if cred.MinShepherdVersion != "" {
45+
_, err = version.NewVersion(cred.MinShepherdVersion)
5446
if err != nil {
5547
return fmt.Errorf("Error occurred when validating minShepherdVersion: %s", err.Error())
5648
}
5749
}
58-
profileConfig.MinShepherdVersion = minShepherdVersion
5950

6051
// Store user info in ~/.gen3/gen3_client_config.ini
61-
err = conf.UpdateConfigFile(*profileConfig)
52+
err = conf.UpdateConfigFile(*cred)
6253
if err != nil {
6354
return err
6455
}
65-
log.Println(`Profile '` + profile + `' has been configured successfully.`)
56+
log.Println(`Profile '` + cred.Profile + `' has been configured successfully.`)
6657
err = logs.CloseMessageLog()
6758
if err != nil {
6859
log.Println(err.Error())

0 commit comments

Comments
 (0)