Travis to Github Action Migration

.github/workflows/release.yml

@@ -1,13 +1,103 @@
-name: Release
+name: CI & Release
 
 on:
   push:
     branches:
       - main
+  pull_request:
+    branches:
+      - main
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
+  common-setup:
+    runs-on: ubuntu-latest
+    outputs:
+      should_release: ${{ steps.check_release.outputs.should_release }}
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Print Go Version
+        run: go version
+
+      - name: Get commit message
+        id: get_commit
+        run: |
+          message=$(git log -1 --pretty=%B)
+          echo "message=$message" >> "$GITHUB_OUTPUT"
+
+      - name: Check if release should be triggered
+        id: check_release
+        run: |
+          if [[ "${{ steps.get_commit.outputs.message }}" == *"release"* ]]; then
+            echo "should_release=true" >> "$GITHUB_OUTPUT"
+            echo "Release will be triggered (found 'release' in commit message)"
+          else
+            echo "should_release=false" >> "$GITHUB_OUTPUT"
+            echo "Release will NOT be triggered (no 'release' in commit message)"
+          fi
+
+  build-and-test:
+    needs: common-setup
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write      # needed to push coverage to gh-pages
+      pull-requests: write # needed to comment on PRs
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Install system dependencies (bc + docker)
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y bc docker-ce-cli
+
+      - name: Prepare environment
+        run: |
+          export GO111MODULE=on
+          go mod tidy
+          make deps
+
+      - name: Check code formatting
+        run: make fmt
+
+      - name: Run unit tests
+        run: make test
+
+      - name: Generate coverage
+        run: |
+          make coverage
+          ./scripts/calculateCoverage.sh
+          touch "Passing" || touch "Failed"
+
+      - name: Build driver image
+        run: |
+          make driver
+        env:
+          RHSM_USER: ${{ secrets.RHSM_USER }}
+          RHSM_PASS: ${{ secrets.RHSM_PASS }}
+
+      - name: Publish coverage
+        if: success()
+        env:
+          GHE_TOKEN: ${{ secrets.GHE_TOKEN }}
+        run: |
+          ./scripts/publishCoverage.sh
+
   release:
-    permissions: write-all 
+    needs: [common-setup, build-and-test]
+    if: needs.common-setup.outputs.should_release == 'true'
+    permissions: write-all
     runs-on: ubuntu-latest
 
     strategy:
@@ -20,55 +110,59 @@ jobs:
       APP_VERSION: 1.0.5
 
     steps:
-    - name: Checkout Code
-      uses: actions/checkout@v5
-
-    - name: Print Go Version
-      run: go version
+      - name: Checkout Code
+        uses: actions/checkout@v5
 
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: "go"
-
-    - name: Run Unit Tests for cos csi mounter
-      run: sudo make ut-coverage -C ${{ matrix.package_dir }}
-
-    - name: Build Debian and RPM packages for cos-csi-mounter systemd service
-      run: |
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: "go"
+
+      - name: Build Debian and RPM packages for cos-csi-mounter systemd service
+        run: |
           cd ${{ matrix.package_dir }}
           make packages
 
-    - name: Get last commit message
-      id: check_commit
-      run:  |
-            message=$(git log -1 --pretty=%B)
-            message="${message//'%'/'%25'}"  # Escape '%'
-            message="${message//$'\n'/'%0A'}"  # Escape newlines
-            message="${message//$'\r'/'%0D'}"  # Escape carriage returns
-            echo "message=$message" >> "$GITHUB_OUTPUT"
-      shell: bash
-
-    - name: Check Commit Message
-      run: |
+      - name: Get last commit message
+        id: check_commit
+        run:  |
+          message=$(git log -1 --pretty=%B)
+          message="${message//'%'/'%25'}"  # Escape '%'
+          message="${message//$'\n'/'%0A'}"  # Escape newlines
+          message="${message//$'\r'/'%0D'}"  # Escape carriage returns
+          echo "message=$message" >> "$GITHUB_OUTPUT"
+        shell: bash
+
+      - name: Check Commit Message
+        run: |
           echo "Commit Message: ${{ steps.check_commit.outputs.message }}"
 
-    - name: Latest Version (Tag and Release)
-      id: release
-      if: contains(steps.check_commit.outputs.message, 'publish')
-      uses: softprops/action-gh-release@v2
-      with:
-        files: |
-          /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz
-          /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256
-          /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz
-          /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256
-        tag_name: v1.0.5
-        name: v1.0.5
-        body: |
-          ## 🚀 What’s New
-          - Fix for rclone mount hang issue
-        prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }}
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      - name: Check Commit Message for Release Trigger
+        id: check_commit_condition
+        run: |
+          echo "Commit Message: ${{ steps.check_commit.outputs.message }}"
+          if [[ "${{ steps.check_commit.outputs.message }}" == *"release"* ]]; then
+            echo "Release job triggered"
+          else
+            echo "No 'release' keyword found in the commit message. Skipping release job."
+            exit 0  # Exit early to skip the release job
+          fi
+
+      - name: Latest Version (Tag and Release)
+        if: success()
+        id: release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz
+            /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.deb.tar.gz.sha256
+            /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz
+            /home/runner/work/ibm-object-csi-driver/ibm-object-csi-driver/cos-csi-mounter/cos-csi-mounter-${{ env.APP_VERSION }}.rpm.tar.gz.sha256
+          tag_name: v1.0.5
+          name: v1.0.5
+          body: |
+            ## 🚀 What’s New
+            - Fix for rclone mount hang issue
+          prerelease: ${{ env.IS_LATEST_RELEASE != 'true' }}
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3

Dockerfile

@@ -64,4 +64,4 @@ RUN yum update -y && yum install fuse fuse-libs fuse3 fuse3-libs -y
 COPY --from=s3fs-builder /usr/local/bin/s3fs /usr/bin/s3fs
 COPY --from=rclone-builder /usr/local/bin/rclone /usr/bin/rclone
 COPY ibm-object-csi-driver ibm-object-csi-driver
-ENTRYPOINT ["/ibm-object-csi-driver"]
+ENTRYPOINT ["/ibm-object-csi-driver"]

Makefile

@@ -3,16 +3,14 @@ EXE_DRIVER_NAME=ibm-object-csi-driver
 
 REGISTRY=quay.io/ibm-object-csi-driver
 
-export LINT_VERSION="2.3.1"
+export LINT_VERSION="2.7.2"
 
 COLOR_YELLOW=\033[0;33m
 COLOR_RESET=\033[0m
 GOFILES=$(shell find . -type f -name '*.go' -not -path "./vendor/*")
 
-
 all: build
 
-
 .PHONY: build-% clean
 
 REV=$(shell git describe --long --tags --match='v*' --dirty 2>/dev/null || git rev-list -n1 HEAD)
@@ -33,9 +31,10 @@ test:
 
 .PHONY: deps
 deps:
-	echo "Installing dependencies ..."
+	@echo "Installing dependencies ..."
 	@if ! which golangci-lint >/dev/null || [[ "$$(golangci-lint --version)" != *${LINT_VERSION}* ]]; then \
-		go install github.com/golangci/golangci-lint/cmd/golangci-lint@v${LINT_VERSION}; \
+		curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | \
+		sh -s -- -b $(shell go env GOPATH)/bin v${LINT_VERSION}; \
 	fi
 
 .PHONY: fmt
@@ -44,9 +43,10 @@ fmt: lint
 
 .PHONY: coverage
 coverage: test
-	cat coverage.out | grep -v /fake > cover.out;
-	# go tool cover -html=cover.out -o=cover.html
-	go tool cover -func=cover.out | fgrep total
+	cat coverage.out | grep -v /fake > cover.out
+	go tool cover -html=cover.out -o cover.html
+	@echo "Coverage report: cover.html"
+	@./scripts/calculateCoverage.sh
 
 clean:
 	-rm -rf bin

pkg/mounter/mounter_test.go

@@ -1,14 +1,28 @@
 package mounter
 
 import (
+	"reflect"
+	"sort"
+	"testing"
+
 	"github.com/IBM/ibm-object-csi-driver/pkg/constants"
 	mounterUtils "github.com/IBM/ibm-object-csi-driver/pkg/mounter/utils"
 	"github.com/stretchr/testify/assert"
-
-	"reflect"
-	"testing"
 )
 
+func stringSlicesEqualIgnoreOrder(a, b []string) bool {
+	if len(a) != len(b) {
+		return false
+	}
+	aCopy := make([]string, len(a))
+	bCopy := make([]string, len(b))
+	copy(aCopy, a)
+	copy(bCopy, b)
+	sort.Strings(aCopy)
+	sort.Strings(bCopy)
+	return reflect.DeepEqual(aCopy, bCopy)
+}
+
 func TestNewMounter(t *testing.T) {
 	tests := []struct {
 		name         string
@@ -41,7 +55,7 @@ func TestNewMounter(t *testing.T) {
 				AuthType:      "iam",
 				KpRootKeyCrn:  "test-kp-root-key-crn",
 				MountOptions:  []string{"opt1=val1", "cipher_suites=default"},
-				MounterUtils:  &(mounterUtils.MounterOptsUtils{}),
+				MounterUtils:  &mounterUtils.MounterOptsUtils{},
 			},
 			expectedErr: nil,
 		},
@@ -71,7 +85,7 @@ func TestNewMounter(t *testing.T) {
 				UID:           "fake-uid",
 				GID:           "fake-gid",
 				MountOptions:  []string{"opt1=val1", "opt2=val2"},
-				MounterUtils:  &(mounterUtils.MounterOptsUtils{}),
+				MounterUtils:  &mounterUtils.MounterOptsUtils{},
 			},
 			expectedErr: nil,
 		},
@@ -97,7 +111,7 @@ func TestNewMounter(t *testing.T) {
 				AuthType:      "hmac",
 				KpRootKeyCrn:  "test-kp-root-key-crn",
 				MountOptions:  []string{"cipher_suites=default"},
-				MounterUtils:  &(mounterUtils.MounterOptsUtils{}),
+				MounterUtils:  &mounterUtils.MounterOptsUtils{},
 			},
 			expectedErr: nil,
 		},
@@ -109,6 +123,23 @@ func TestNewMounter(t *testing.T) {
 
 			result := factory.NewMounter(test.attrib, test.secretMap, test.mountOptions, nil)
 
+			if s3fs, ok := result.(*S3fsMounter); ok {
+				expected := test.expected.(*S3fsMounter)
+				if !stringSlicesEqualIgnoreOrder(s3fs.MountOptions, expected.MountOptions) {
+					t.Errorf("MountOptions mismatch.\nGot:  %v\nWant: %v", s3fs.MountOptions, expected.MountOptions)
+				}
+				s3fs.MountOptions = nil
+				expected.MountOptions = nil
+			}
+			if rclone, ok := result.(*RcloneMounter); ok {
+				expected := test.expected.(*RcloneMounter)
+				if !stringSlicesEqualIgnoreOrder(rclone.MountOptions, expected.MountOptions) {
+					t.Errorf("MountOptions mismatch.\nGot:  %v\nWant: %v", rclone.MountOptions, expected.MountOptions)
+				}
+				rclone.MountOptions = nil
+				expected.MountOptions = nil
+			}
+
 			assert.Equal(t, result, test.expected)
 
 			if !reflect.DeepEqual(result, test.expected) {