Travis to Github Action Migration

.github/workflows/release.yml

@@ -1,13 +1,85 @@
-name: Release
+name: CI & Release
 
 on:
   push:
     branches:
       - main
+      - master
+    tags:
+      - "v[0-9]+.[0-9]+.[0-9]+*"
+  pull_request:
+    branches:
+      - main
+      - master
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
 
 jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write      # needed to push coverage to gh-pages
+      pull-requests: write # needed to comment on PRs
+
+    strategy:
+      matrix:
+        go-version: ["1.24.5", "stable"]
+      fail-fast: false
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v5
+        with:
+          fetch-depth: 0
+
+      - name: Set up Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ${{ matrix.go-version }}
+          check-latest: true
+          cache: true
+
+      - name: Install system dependencies (bc + docker)
+        run: |
+          sudo apt-get update -qq
+          sudo apt-get install -y bc docker-ce-cli
+
+      - name: Make scripts executable
+        run: chmod +x scripts/*.sh || true
+
+      - 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
+
+      - name: Publish coverage
+        if: success() && matrix.go-version == 'stable' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        env:
+          GHE_TOKEN: ${{ secrets.GHE_TOKEN }}
+        run: |
+          ./scripts/publishCoverage.sh
+
   release:
-    permissions: write-all 
+    needs: build-and-test
+    permissions: write-all
     runs-on: ubuntu-latest
 
     strategy:
@@ -30,7 +102,7 @@ jobs:
       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 }}
 
@@ -41,11 +113,11 @@ jobs:
 
     - name: Get last commit message
       id: check_commit
-      run:  |
+      run: |
             message=$(git log -1 --pretty=%B)
-            message="${message//'%'/'%25'}"  # Escape '%'
-            message="${message//$'\n'/'%0A'}"  # Escape newlines
-            message="${message//$'\r'/'%0D'}"  # Escape carriage returns
+            message="${message//'%'/'%25'}"
+            message="${message//$'\n'/'%0A'}"
+            message="${message//$'\r'/'%0D'}"
             echo "message=$message" >> "$GITHUB_OUTPUT"
       shell: bash
 
@@ -66,9 +138,9 @@ jobs:
         tag_name: v1.0.5
         name: v1.0.5
         body: |
-          ## 🚀 What’s New
+          ## 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

@@ -1,31 +1,41 @@
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.10-1179.1741863533 AS s3fs-builder
 
-ARG   RHSM_PASS=blank
-ARG   RHSM_USER=blank
-
-ENV   RHSM_PASS="${RHSM_PASS}"
-ENV   RHSM_USER="${RHSM_USER}"
-
-ADD   register-sys.sh /usr/bin/
-RUN   microdnf update --setopt=tsflags=nodocs && \
-      microdnf install -y --nodocs hostname subscription-manager
-RUN   hostname; chmod 755 /usr/bin/register-sys.sh &&  /usr/bin/register-sys.sh
-RUN   microdnf update --setopt=tsflags=nodocs && \
-      microdnf install -y --nodocs iputils nfs-utils rpcbind xfsprogs udev nc e2fsprogs e4fsprogs && \
-      microdnf clean all -y
-RUN   microdnf update --setopt=tsflags=nodocs && \
-      microdnf install -y gcc libstdc++-devel \
-      gcc-c++ fuse curl-devel \
-      libxml2-devel openssl-devel mailcap \
-      git automake make
-RUN   microdnf -y install fuse-devel
-RUN   rm /usr/bin/register-sys.sh && subscription-manager unregister && subscription-manager clean
-
-RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git && cd s3fs-fuse && \
+ARG RHSM_PASS=blank
+ARG RHSM_USER=blank
+ENV RHSM_PASS="${RHSM_PASS}"
+ENV RHSM_USER="${RHSM_USER}"
+
+ADD register-sys.sh /usr/bin/
+
+RUN microdnf update --setopt=tsflags=nodocs && \
+    microdnf install -y --nodocs hostname subscription-manager findutils xz && \
+    microdnf clean all -y
+
+RUN echo "Skipping RHSM registration in public CI" && hostname
+
+RUN microdnf update --setopt=tsflags=nodocs && \
+    microdnf install -y --nodocs iputils nmap-ncat udev findutils && \
+    microdnf clean all -y
+
+RUN microdnf update --setopt=tsflags=nodocs && \
+    microdnf install -y gcc libstdc++-devel \
+    gcc-c++ fuse curl-devel \
+    libxml2-devel openssl-devel mailcap \
+    git automake make && \
+    microdnf clean all -y
+
+RUN microdnf -y install fuse-devel && microdnf clean all -y
+
+RUN rm /usr/bin/register-sys.sh && subscription-manager unregister && subscription-manager clean || true
+
+RUN git clone https://github.com/s3fs-fuse/s3fs-fuse.git && \
+    cd s3fs-fuse && \
     git checkout v1.94 && \
-    ./autogen.sh && ./configure --prefix=/usr/local --with-openssl && make && make install && \
+    ./autogen.sh && ./configure --prefix=/usr/local --with-openssl && \
+    make && make install && \
     rm -rf /var/lib/apt/lists/*
 
+
 FROM registry.access.redhat.com/ubi8/ubi AS rclone-builder
 RUN yum install wget git gcc -y
 
@@ -50,6 +60,8 @@ RUN git clone https://github.com/rclone/rclone.git && \
       go build && ./rclone version && \
       cp rclone /usr/local/bin/rclone
 
+# ---------------------------------------------------------------------------------------
+
 FROM registry.access.redhat.com/ubi8/ubi:latest
 
 # Default values
@@ -60,7 +72,10 @@ ARG build_date=unknown
 LABEL description="IBM CSI Object Storage Plugin"
 LABEL build-date=${build_date}
 LABEL git-commit-id=${git_commit_id}
-RUN yum update -y && yum install fuse fuse-libs fuse3 fuse3-libs -y
+
+RUN yum update -y && \
+    yum install -y fuse fuse-libs fuse3 fuse3-libs && \
+    yum clean all -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

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="1.64.8"
 
 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)
@@ -29,13 +27,14 @@ GOPACKAGES=$(shell go list ./... | grep -v ./tests/... | grep -v /mounter/utils
 
 .PHONY: test
 test:
-	go test -v -race ${GOPACKAGES} -coverprofile=coverage.out
+	go run github.com/pierrre/gotestcover@latest -v -race -coverprofile=coverage.out ${GOPACKAGES}
 
 .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) {