CSM 1.16 updates

.gitignore

@@ -20,4 +20,6 @@
 .vscode/
 
 # For .idea users
-.idea
+.idea
+
+vendor/

Makefile

@@ -23,20 +23,3 @@ unit-test: build
 .PHONY: coverage
 coverage: build
 	go test -json -covermode=atomic -coverpkg=./... -coverprofile goisilon_coverprofile.out ./... -run ^Test
-
-.PHONY: actions action-help
-actions: ## Run all GitHub Action checks that run on a pull request creation
-	@echo "Running all GitHub Action checks for pull request events..."
-	@act -l | grep -v ^Stage | grep pull_request | grep -v image_security_scan | awk '{print $$2}' | while read WF; do \
-		echo "Running workflow: $${WF}"; \
-		act pull_request --no-cache-server --platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest --job "$${WF}"; \
-	done
-
-action-help: ## Echo instructions to run one specific workflow locally
-	@echo "GitHub Workflows can be run locally with the following command:"
-	@echo "act pull_request --no-cache-server --platform ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest --job <jobid>"
-	@echo ""
-	@echo "Where '<jobid>' is a Job ID returned by the command:"
-	@echo "act -l"
-	@echo ""
-	@echo "NOTE: if act is not installed, it can be downloaded from https://github.com/nektos/act"

README.md

@@ -1,3 +1,19 @@
+# :lock: **Important Notice**
+Starting with the release of **Container Storage Modules v1.16.0**, this repository will no longer be maintained as an open source project. Future development will continue under a closed source model. This change reflects our commitment to delivering even greater value to our customers by enabling faster innovation and more deeply integrated features with the Dell storage portfolio.<br>
+For existing customers using Dell’s Container Storage Modules, you will continue to receive:
+* **Ongoing Support & Community Engagement**<br>
+       You will continue to receive high-quality support through Dell Support and our community channels. Your experience of engaging with the Dell community remains unchanged.
+* **Streamlined Deployment & Updates**<br>
+        Deployment and update processes will remain consistent, ensuring a smooth and familiar experience.
+* **Access to Documentation & Resources**<br>
+       All documentation and related materials will remain publicly accessible, providing transparency and technical guidance.
+* **Continued Access to Current Open Source Version**<br>
+       The current open-source version will remain available under its existing license for those who rely on it.
+
+Moving to a closed source model allows Dell’s development team to accelerate feature delivery and enhance integration across our Enterprise Kubernetes Storage solutions ultimately providing a more seamless and robust experience.<br>
+We deeply appreciate the contributions of the open source community and remain committed to supporting our customers through this transition.<br>
+
+For questions or access requests, please contact the maintainers via [Dell Support](https://www.dell.com/support/kbdoc/en-in/000188046/container-storage-interface-csi-drivers-and-container-storage-modules-csm-how-to-get-support).
 
 # GoIsilon
 
@@ -122,4 +138,3 @@ specific language governing permissions and limitations under the License.
 ## Support
 
 For any issues, questions or feedback, please follow our [support process](https://github.com/dell/csm/blob/main/docs/SUPPORT.md)
-

acls.go

@@ -13,12 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package goisilon
+package gopowerscale
 
 import (
 	"context"
 
-	api "github.com/dell/goisilon/api/v2"
+	api "github.com/dell/gopowerscale/api/v2"
 )
 
 // ACL is an Isilon Access Control List used for managing an object's security.

acls_test.go

@@ -13,12 +13,12 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 */
-package goisilon
+package gopowerscale
 
 import (
 	"testing"
 
-	"github.com/dell/goisilon/mocks"
+	"github.com/dell/gopowerscale/mocks"
 	"github.com/stretchr/testify/assert"
 )
 

api/api.go

@@ -32,12 +32,17 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/akutz/gournal"
-	"github.com/sirupsen/logrus"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/PuerkitoBio/goquery"
 )
 
+type contextKey uint8
+
+const (
+	LevelKey contextKey = iota
+)
+
 const (
 	headerKeyContentType                  = "Content-Type"
 	headerValContentTypeJSON              = "application/json"
@@ -400,7 +405,7 @@ var doWithHeadersFunc = func(c *client, ctx context.Context, method string, uri
 	}
 	defer func() {
 		if err := res.Body.Close(); err != nil {
-			logrus.Printf("Error closing HTTP response: %s", err.Error())
+			log.Printf("Error closing HTTP response: %s", err.Error())
 		}
 	}()
 	logResponse(ctx, res, c.verboseLogging)
@@ -494,7 +499,7 @@ var doAndGetResponseBodyFunc = func(
 			req, err = http.NewRequest(method, u.String(), r)
 			defer func() {
 				if err := r.Close(); err != nil {
-					logrus.Printf("Error closing HTTP response: %s", err.Error())
+					log.Printf("Error closing HTTP response: %s", err.Error())
 				}
 			}()
 			if v, ok := headers[headerKeyContentType]; ok {
@@ -557,10 +562,10 @@ var doAndGetResponseBodyFunc = func(
 	logReqBuf := &bytes.Buffer{}
 
 	if debug {
-		log.Info(ctx, "Setting log level to debug in goisilon")
+		log.Info(ctx, "Setting log level to debug in gopowerscale")
 		ctx = context.WithValue(
 			ctx,
-			log.LevelKey(),
+			LevelKey,
 			log.DebugLevel)
 	}
 
@@ -680,7 +685,7 @@ var authenticateFunc = func(c *client, ctx context.Context, username string, pas
 		log.Debug(ctx, "Authentication response code: %d", resp.StatusCode)
 		defer func() {
 			if err := resp.Body.Close(); err != nil {
-				logrus.Printf("Error closing HTTP response: %s", err.Error())
+				log.Printf("Error closing HTTP response: %s", err.Error())
 			}
 		}()
 

api/api_logging.go

@@ -26,7 +26,7 @@ import (
 	"net/http/httputil"
 	"strings"
 
-	log "github.com/akutz/gournal"
+	log "github.com/sirupsen/logrus"
 )
 
 func isBinOctetBody(h http.Header) bool {

api/v1/api_v1.go

@@ -22,7 +22,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/dell/goisilon/api"
+	"github.com/dell/gopowerscale/api"
 )
 
 const (
@@ -102,5 +102,5 @@ func getAuthMemberID(memberType string, memberName *string, memberID *int32) (au
 	if memberID != nil {
 		authMemberID = fmt.Sprintf("%sID:%d", strings.ToUpper(memberType)[0:1], *memberID)
 	}
-	return
+	return authMemberID, err
 }

api/v1/api_v1_exports.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/dell/goisilon/api"
+	"github.com/dell/gopowerscale/api"
 )
 
 // Export enables an NFS export on the cluster to access the volumes.  Return the path to the export

api/v1/api_v1_exports_test.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/dell/goisilon/mocks"
+	"github.com/dell/gopowerscale/mocks"
 	"github.com/stretchr/testify/assert"
 )
 

api/v1/api_v1_quotas.go

@@ -19,7 +19,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/dell/goisilon/api"
+	"github.com/dell/gopowerscale/api"
 )
 
 // GetIsiQuota queries the quota for a directory

api/v1/api_v1_quotas_test.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/dell/goisilon/mocks"
+	"github.com/dell/gopowerscale/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

api/v1/api_v1_roles.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/dell/goisilon/api"
+	"github.com/dell/gopowerscale/api"
 )
 
 // GetIsiRole queries the role by role-id.
@@ -29,12 +29,12 @@ func GetIsiRole(ctx context.Context, client api.Client, roleID string) (role *Is
 
 	var roleResp *IsiRoleListResp
 	if err = client.Get(ctx, rolePath, roleID, nil, nil, &roleResp); err != nil {
-		return
+		return role, err
 	}
 
 	if roleResp.Roles != nil && len(roleResp.Roles) > 0 {
 		role = roleResp.Roles[0]
-		return
+		return role, err
 	}
 
 	return nil, fmt.Errorf("role not found: %s", roleID)
@@ -54,7 +54,7 @@ func GetIsiRoleList(ctx context.Context, client api.Client, queryResolveNames *b
 	var roleListResp *IsiRoleListRespResume
 	// First call without Resume param
 	if err = client.Get(ctx, rolePath, "", values, nil, &roleListResp); err != nil {
-		return
+		return roles, err
 	}
 
 	for {
@@ -64,17 +64,17 @@ func GetIsiRoleList(ctx context.Context, client api.Client, queryResolveNames *b
 		}
 
 		if roleListResp, err = getIsiRoleListWithResume(ctx, client, roleListResp.Resume); err != nil {
-			return
+			return roles, err
 		}
 	}
 
-	return
+	return roles, err
 }
 
 // getIsiRoleListWithResume queries the next page roles based on resume token.
 func getIsiRoleListWithResume(ctx context.Context, client api.Client, resume string) (roles *IsiRoleListRespResume, err error) {
 	err = client.Get(ctx, rolePath, "", api.OrderedValues{{[]byte("resume"), []byte(resume)}}, nil, &roles)
-	return
+	return roles, err
 }
 
 // AddIsiRoleMember adds a member to the role, member can be user/group.

api/v1/api_v1_roles_test.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/dell/goisilon/mocks"
+	"github.com/dell/gopowerscale/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

api/v1/api_v1_snapshots.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"path"
 
-	"github.com/dell/goisilon/api"
+	"github.com/dell/gopowerscale/api"
 )
 
 // GetIsiSnapshots queries a list of all snapshots on the cluster

api/v1/api_v1_snapshots_test.go

@@ -21,7 +21,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/dell/goisilon/mocks"
+	"github.com/dell/gopowerscale/mocks"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 )

api/v1/api_v1_test.go

@@ -19,7 +19,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/dell/goisilon/mocks"
+	"github.com/dell/gopowerscale/mocks"
 	"github.com/stretchr/testify/assert"
 )