Remove dead-code

Author: Shailza Thakur

code-engine-cos2cos/bucketOperations/bucketOperations_test.go

@@ -17,90 +17,6 @@ func TestBucketOps(t *testing.T) {
 	ginkgo.RunSpecs(t, "BucketOperations Suite")
 }
 
-var _ = ginkgo.Describe("ListAvailableBuckets", func() {
-	var (
-		mockS3Client *MockS3Client
-		bucket       *Bucket
-	)
-
-	// Before each test, initialize the mock and the Bucket struct
-	ginkgo.BeforeEach(func() {
-		mockS3Client = new(MockS3Client)
-		bucket = &Bucket{
-			Name:   "test-bucket",
-			Client: mockS3Client,
-		}
-	})
-
-	// Test case struct format
-	type TestCase struct {
-		name           string
-		mockResponse   *s3.ListBucketsOutput
-		mockError      error
-		expectedOutput *s3.ListBucketsOutput
-		expectedError  error
-	}
-
-	// Define test cases
-	var testCases = []TestCase{
-		{
-			name: "Successful ListBuckets",
-			mockResponse: &s3.ListBucketsOutput{
-				Buckets: []*s3.Bucket{
-					{
-						Name: aws.String("bucket1"),
-					},
-					{
-						Name: aws.String("bucket2"),
-					},
-				},
-			},
-			mockError: nil,
-			expectedOutput: &s3.ListBucketsOutput{
-				Buckets: []*s3.Bucket{
-					{
-						Name: aws.String("bucket1"),
-					},
-					{
-						Name: aws.String("bucket2"),
-					},
-				},
-			},
-			expectedError: nil,
-		},
-		{
-			name:           "Error Listing Buckets",
-			mockResponse:   nil,
-			mockError:      errors.New("failed to list buckets"),
-			expectedOutput: nil,
-			expectedError:  errors.New("failed to list buckets"),
-		},
-	}
-
-	// Iterate over test cases
-	for _, testCase := range testCases {
-		ginkgo.It(testCase.name, func() {
-			// Arrange mock behavior
-			mockS3Client.On("ListBuckets", mock.Anything).Return(testCase.mockResponse, testCase.mockError)
-
-			// Act
-			result, err := bucket.ListAvailableBuckets()
-
-			// Assert the results
-			if testCase.expectedError != nil {
-				gomega.Expect(err).To(gomega.HaveOccurred())
-				gomega.Expect(err.Error()).To(gomega.Equal(testCase.expectedError.Error()))
-			} else {
-				gomega.Expect(err).ToNot(gomega.HaveOccurred())
-				gomega.Expect(result).To(gomega.Equal(testCase.expectedOutput))
-			}
-
-			// Assert that the mock was called as expected
-			mockS3Client.AssertExpectations(ginkgo.GinkgoT())
-		})
-	}
-})
-
 var _ = ginkgo.Describe("ListBucketObjects", func() {
 
 	var (
@@ -148,7 +64,6 @@ var _ = ginkgo.Describe("ListBucketObjects", func() {
 
 	// Iterate through the test cases
 	for _, tc := range testCases {
-		tc := tc // capture the range variable
 		ginkgo.Context(tc.description, func() {
 			ginkgo.It("should handle the response correctly", func() {
 				// Setup mock expectation

code-engine-cos2cos/bucketOperations/bucketOps.go

@@ -40,7 +40,6 @@ type CosSession struct {
 }
 
 func NewCosClient(apiKey, resourceInstanceID, serviceEndpoint, region string, authEndpoint ...string) *s3.S3 {
-	// fmt.Println("Creating cos Client")
 	var authEndpointVal string
 	if len(authEndpoint) == 0 {
 		authEndpointVal = "https://iam.cloud.ibm.com/identity/token"
@@ -120,35 +119,14 @@ func (c *CosSession) CreateIBMCOSSessionTrustedProfile() *s3.S3 {
 
 	return client
 }
-
-// Function to list all the available buckets for a config.
-func (b *Bucket) ListAvailableBuckets() (*s3.ListBucketsOutput, error) {
-
-	// Create client
-	// client := CreateIBMCOSSession()
-	client := b.Client
-	// Call Function
-	d, err := client.ListBuckets(&s3.ListBucketsInput{})
-
-	if err != nil {
-		fmt.Println("Could not list the buckets")
-		return nil, err
-	}
-	return d, nil
-}
-
 func (b *Bucket) ListBucketObjects() (*s3.ListObjectsV2Output, error) {
 	bucketName := b.Name
-	// fmt.Println("Listing Bucket Objects in Bucket:", bucketName)
-	// Create client
-	// client := CreateIBMCOSSession()
 	client := b.Client
 
 	// Call Function
 	Input := &s3.ListObjectsV2Input{
 		Bucket: aws.String(bucketName),
 	}
-	// fmt.Println("Input object created", Input)
 	objectList, e := client.ListObjectsV2(Input)
 
 	if e != nil {
@@ -161,9 +139,6 @@ func (b *Bucket) ListBucketObjects() (*s3.ListObjectsV2Output, error) {
 
 func (b *Bucket) ListBucketObjectsPagination() (*s3.ListObjectsV2Output, error) {
 	bucketName := b.Name
-	// fmt.Println("Listing Bucket Objects in Bucket:", bucketName)
-	// Create client
-	// client := CreateIBMCOSSession()
 	client := b.Client
 
 	// Call Function
@@ -211,72 +186,3 @@ func (bucket *Bucket) UploadBytesToBucket(objectKey string, data []byte) error {
 
 	return nil
 }
-
-// Function to upload a object to a bucket. - Not Tested.
-/*
-func (b *Bucket) UploadObjectToBucket(object *s3.GetObjectOutput) error {
-	client := b.Client
-
-	var buf bytes.Buffer
-	_, err := buf.ReadFrom(object.Body)
-	if err != nil {
-		log.Fatalf("Unable to read object body: %v", err)
-		return fmt.Errorf("Unable to read object body: %v", err)
-	}
-
-	_, err = client.PutObject(&s3.PutObjectInput{
-		Bucket: aws.String(destinationBucket),
-		Key:    aws.String(destinationKey),
-		Body:   bytes.NewReader(buf.Bytes()),
-	})
-	if err != nil {
-		log.Fatalf("Unable to upload object to destination bucket: %v", err)
-		return fmt.Errorf("Unable to upload object to destination bucket: %v", err)
-	}
-	return nil
-}
-*/
-
-// Returns an error if the upload fails. - Unused
-/*
-func (b *Bucket) UploadFileToBucket(objectKey string, filePath string) error {
-
-	// Create client
-	// client := CreateIBMCOSSession()
-	client := b.Client
-	bucketName := b.Name
-
-	// Read object into byte
-
-	file, err := os.Open(filePath)
-
-	if err != nil {
-		log.Fatalf("Unable to open file: %v", err)
-		return err
-	}
-
-	fileInfo, err := file.Stat()
-	if err != nil {
-		log.Fatalf("Unable to get file stats: %v", err)
-		return err
-	}
-	fileBytes := make([]byte, fileInfo.Size())
-	_, err = file.Read(fileBytes)
-
-	if err != nil {
-		log.Fatalf("Unable to read file: %v", err)
-		return err
-	}
-
-	input := s3.PutObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-		Body:   bytes.NewReader(fileBytes),
-	}
-
-	// Call Function to upload (Put) an object
-	_, _ = client.PutObject(&input)
-	// fmt.Println(result)
-	return nil
-}
-*/

code-engine-cos2cos/bucketOperations/objectOps.go

@@ -35,15 +35,14 @@ func (b *Bucket) CheckIfTagExists(objectKey string) (bool, error) {
 	})
 
 	if err != nil {
-		return false, fmt.Errorf("Error getting object tags: %v", err)
+		return false, fmt.Errorf("error getting object tags: %v", err)
 
 	}
 	tagKeyToCheck := "isInProcessing"
 
 	// Iterate through the tags and check if the key exists
 	for _, tag := range resp.TagSet {
 		if *tag.Key == tagKeyToCheck {
-			// fmt.Println(tag)
 			return true, nil
 		}
 	}
@@ -52,7 +51,6 @@ func (b *Bucket) CheckIfTagExists(objectKey string) (bool, error) {
 
 func IsProcessingRequired(res *s3.Object, timestamp time.Time) bool {
 	compareVal := CompareUpdateTime(res, timestamp)
-	// fmt.Printf("The time for last process is: %s\nObject last time:%s\n", timestamp.String(), res.LastModified.String())
 	// A negative value indicates that process is required.
 	return compareVal > 0
 }
@@ -74,62 +72,6 @@ func (b *Bucket) GetObject(objectKey string) (*s3.GetObjectOutput, error) {
 	return response, nil
 }
 
-/*
-Function to store the object in a file in local storage
-func StoreObject(objectKey string, response *s3.GetObjectOutput) error {
-
-	tempFile, err := os.Create(fmt.Sprintf("temp/%s", objectKey))
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Read from response body
-	_, err = tempFile.ReadFrom(response.Body)
-
-	if err != nil {
-		return err
-	}
-	return nil
-}
-*/
-
-/*
-// Function to get the metadata of an object without getting the object itself - Unused
-func (b *Bucket) GetObjectMetadata(objectKey string) (*s3.HeadObjectOutput, error) {
-	client := b.Client
-	bucketName := b.Name
-
-	input := &s3.HeadObjectInput{
-		Bucket: aws.String(bucketName),
-		Key:    aws.String(objectKey),
-	}
-
-	result, err := client.HeadObject(input)
-	if err != nil {
-		// log.Fatalf("Failed to retrieve metadata: %v", err)
-		return nil, err
-	}
-
-	// fmt.Println("Metadata for object:", objectKey)
-	// fmt.Printf("Last Modified: %v\n", result.LastModified)
-	// fmt.Printf("Size: %d bytes\n", *result.ContentLength)
-	// fmt.Printf("Content-Type: %s\n", *result.ContentType)
-	// fmt.Printf("ETag: %s\n", *result.ETag)
-
-	// Print custom metadata
-	if result.Metadata != nil {
-		fmt.Println("Custom Metadata:")
-		for key, value := range result.Metadata {
-			fmt.Printf("%s: %s\n", key, *value)
-		}
-	}
-
-	return result, nil
-}
-*/
-// test
-
 // Add a tag to the object (for example, a custom tag)
 // The tag is added as a key-value pair
 func (b *Bucket) AddTag(objectKey, tagKey, tagValue string) error {
@@ -170,6 +112,5 @@ func (b *Bucket) DeleteTag(objectKey, tagKey string) error {
 	if err != nil {
 		return fmt.Errorf("failed to delete tag to object: %v", err)
 	}
-	// fmt.Printf("Tag Deleted successfully from the object: %s\n", objectKey)
 	return nil
 }

code-engine-cos2cos/bucketOperations/objectOps_test.go

@@ -13,11 +13,6 @@ import (
 	mockS3 "ibm.com/codeengine/cos2cos/mock"
 )
 
-// func TestObjectOps(t *testing.T) {
-// 	gomega.RegisterFailHandler(ginkgo.Fail)
-// 	ginkgo.RunSpecs(t, "ObjectOperations Suite")
-// }
-
 var _ = ginkgo.Describe("CompareUpdateTime", func() {
 	type testCase struct {
 		name            string