Merge pull request #44 from pratikkumar-mohite/pm/issue-35

Issue 35: Moved the cmd to main package

.github/workflows/ci.yaml

@@ -41,8 +41,8 @@ jobs:
           echo "new_tag=$new_tag" >> $GITHUB_OUTPUT
         fi
 
-    - name: Create and push new tag
-      run: |
-        new_tag=${{ steps.update_latest_tag.outputs.new_tag }}
-        git tag -a $new_tag -m "Release $new_tag"
-        git push origin $new_tag
+    # - name: Create and push new tag
+    #   run: |
+    #     new_tag=${{ steps.update_latest_tag.outputs.new_tag }}
+    #     git tag -a $new_tag -m "Release $new_tag"
+    #     git push origin $new_tag

.github/workflows/release.yaml

@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go
         uses: actions/setup-go@v4

Makefile

@@ -8,17 +8,17 @@ build: bench
 	@CGO_ENABLED=0 go build -pgo=cpu.out -ldflags="-w -s" -v -o s3-cleanup ./cmd/s3-cleanup/
 
 run:
-	@CGO_ENABLED=0 go run main.go
+	@CGO_ENABLED=0 go run ./cmd/s3-cleanup/
 
 test:
 	@go run github.com/golangci/golangci-lint/cmd/golangci-lint@latest run -v --timeout=10m
 	@go test -v -timeout 20m -covermode=atomic -coverprofile=coverage.txt ./...
 
 bench:
-	@go test -v -bench=. -count=6 -cpuprofile=cpu.out -memprofile=mem.out . -run=^Benchmark$ > benchmark.txt
+	@go test -v -bench=. -count=6 -cpuprofile=cpu.out -memprofile=mem.out ./cmd/s3-cleanup/ -run=^Benchmark$ > benchmark.txt
 
 bench-heavy:
-	@go test -v -bench=. -count=10 -cpu=1,2,4,8 -cpuprofile=cpu.out -memprofile=mem.out . -run=^Benchmark$ > benchmark.txt
+	@go test -v -bench=. -count=10 -cpu=1,2,4,8 -cpuprofile=cpu.out -memprofile=mem.out ./cmd/s3-cleanup/ -run=^Benchmark$ > benchmark.txt
 	@benchstat benchmark.txt
 	@echo top | go tool pprof mem.out
 	@echo top | go tool pprof cpu.out

cmd/s3-cleanup/cleanup.go

@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"
@@ -15,7 +15,7 @@ func setup() aws.S3Client {
 	return client
 }
 
-func S3Cleanup() {
+func s3Cleanup() {
 	s3Client := setup()
 	object1 := s3Client.UploadS3BucketObjects("test/files/file1.txt")
 	s3Client.UploadS3BucketObjects("test/files/file2.txt")

cmd/s3-cleanup/main.go

@@ -0,0 +1,5 @@
+package main
+
+func main() {
+	s3Cleanup()
+}

cmd/s3-cleanup/utils.go

@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"