diff --git a/.gitignore b/.gitignore index 466ea596..1e92bfb0 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,6 @@ .vscode/ # For .idea users -.idea \ No newline at end of file +.idea + +vendor/ \ No newline at end of file diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index 4bc98d42..00000000 --- a/Gopkg.lock +++ /dev/null @@ -1,57 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - name = "github.com/akutz/gournal" - packages = [ - ".", - "logrus" - ] - revision = "f6e56fa29076290418175a5105fd0223c66ad1bc" - version = "v0.5.0" - -[[projects]] - name = "github.com/davecgh/go-spew" - packages = ["spew"] - revision = "346938d642f2ec3594ed81d874461961cd0faa76" - version = "v1.1.0" - -[[projects]] - name = "github.com/pmezard/go-difflib" - packages = ["difflib"] - revision = "792786c7400a136282c1664665ae0a8db921c6c2" - version = "v1.0.0" - -[[projects]] - name = "github.com/sirupsen/logrus" - packages = ["."] - revision = "f006c2ac4710855cf0f916dd6b77acf6b048dc6e" - version = "v1.0.3" - -[[projects]] - name = "github.com/stretchr/testify" - packages = ["assert"] - revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0" - version = "v1.1.4" - -[[projects]] - branch = "master" - name = "golang.org/x/crypto" - packages = ["ssh/terminal"] - revision = "2509b142fb2b797aa7587dad548f113b2c0f20ce" - -[[projects]] - branch = "master" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows" - ] - revision = "164713f0dfcec4e80be8b53e1f0811f5f0d84578" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "d3e814d89985e157fb2190558ab3935889188c156c1d2391ba745eabbce63aba" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index b33d3c33..00000000 --- a/Gopkg.toml +++ /dev/null @@ -1,16 +0,0 @@ -# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md -# for detailed Gopkg.toml documentation. -# -# Refer to https://github.com/toml-lang/toml for detailed TOML docs. - -[[constraint]] - name = "github.com/sirupsen/logrus" - version = "1.0.3" - -[[constraint]] - name = "github.com/stretchr/testify" - version = "1.1.4" - -[[constraint]] - name = "github.com/akutz/gournal" - version = "0.5.0" diff --git a/Makefile b/Makefile index 4912a944..6fa589b7 100644 --- a/Makefile +++ b/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 " - @echo "" - @echo "Where '' 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" diff --git a/README.md b/README.md index cde59340..acb0208a 100644 --- a/README.md +++ b/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.
+For existing customers using Dell’s Container Storage Modules, you will continue to receive: +* **Ongoing Support & Community Engagement**
+ 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**
+ Deployment and update processes will remain consistent, ensuring a smooth and familiar experience. +* **Access to Documentation & Resources**
+ All documentation and related materials will remain publicly accessible, providing transparency and technical guidance. +* **Continued Access to Current Open Source Version**
+ 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.
+We deeply appreciate the contributions of the open source community and remain committed to supporting our customers through this transition.
+ +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) - diff --git a/acls.go b/acls.go index ab004dcf..d7d4de09 100644 --- a/acls.go +++ b/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. diff --git a/acls_test.go b/acls_test.go index 51f6b41d..f84e52c3 100755 --- a/acls_test.go +++ b/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" ) diff --git a/api/api.go b/api/api.go index c475edfc..11510936 100755 --- a/api/api.go +++ b/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()) } }() diff --git a/api/api_logging.go b/api/api_logging.go index 6347d40c..2c255f0c 100644 --- a/api/api_logging.go +++ b/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 { diff --git a/api/v1/api_v1.go b/api/v1/api_v1.go index 43c4b0f9..5cdf89c6 100644 --- a/api/v1/api_v1.go +++ b/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 } diff --git a/api/v1/api_v1_exports.go b/api/v1/api_v1_exports.go index fd015f35..cbf33dca 100644 --- a/api/v1/api_v1_exports.go +++ b/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 diff --git a/api/v1/api_v1_exports_test.go b/api/v1/api_v1_exports_test.go index 48c231f1..184df718 100644 --- a/api/v1/api_v1_exports_test.go +++ b/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" ) diff --git a/api/v1/api_v1_quotas.go b/api/v1/api_v1_quotas.go index 149e8269..9db48d23 100644 --- a/api/v1/api_v1_quotas.go +++ b/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 diff --git a/api/v1/api_v1_quotas_test.go b/api/v1/api_v1_quotas_test.go index 03dd5775..a829b415 100644 --- a/api/v1/api_v1_quotas_test.go +++ b/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" ) diff --git a/api/v1/api_v1_roles.go b/api/v1/api_v1_roles.go index e3ca05fc..674fd172 100644 --- a/api/v1/api_v1_roles.go +++ b/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. diff --git a/api/v1/api_v1_roles_test.go b/api/v1/api_v1_roles_test.go index bf3a6923..72f93940 100644 --- a/api/v1/api_v1_roles_test.go +++ b/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" ) diff --git a/api/v1/api_v1_snapshots.go b/api/v1/api_v1_snapshots.go index 5a5f85e5..13f8d4fa 100644 --- a/api/v1/api_v1_snapshots.go +++ b/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 diff --git a/api/v1/api_v1_snapshots_test.go b/api/v1/api_v1_snapshots_test.go index a7496a7d..04bbc7e8 100644 --- a/api/v1/api_v1_snapshots_test.go +++ b/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" ) diff --git a/api/v1/api_v1_test.go b/api/v1/api_v1_test.go index 6dcf6c2f..f6dceb0c 100644 --- a/api/v1/api_v1_test.go +++ b/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" ) diff --git a/api/v1/api_v1_user_groups.go b/api/v1/api_v1_user_groups.go index 26c876b4..541369bb 100644 --- a/api/v1/api_v1_user_groups.go +++ b/api/v1/api_v1_user_groups.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // GetIsiGroup queries the group by group-id. @@ -29,17 +29,17 @@ func GetIsiGroup(ctx context.Context, client api.Client, groupName *string, gid authGroupID, err := getAuthMemberID(fileGroupTypeGroup, groupName, gid) if err != nil { - return + return group, err } var groupListResp *IsiGroupListResp if err = client.Get(ctx, groupPath, authGroupID, nil, nil, &groupListResp); err != nil { - return + return group, err } if groupListResp.Groups != nil && len(groupListResp.Groups) > 0 { group = groupListResp.Groups[0] - return + return group, err } return nil, fmt.Errorf("group not found: %s", authGroupID) @@ -82,7 +82,7 @@ func GetIsiGroupList(ctx context.Context, client api.Client, var groupListResp *IsiGroupListRespResume // First call without Resume param if err = client.Get(ctx, groupPath, "", values, nil, &groupListResp); err != nil { - return + return groups, err } for { @@ -95,13 +95,13 @@ func GetIsiGroupList(ctx context.Context, client api.Client, return nil, err } } - return + return groups, err } // getIsiGroupListWithResume queries the next page groups based on resume token. func getIsiGroupListWithResume(ctx context.Context, client api.Client, resume string) (groups *IsiGroupListRespResume, err error) { err = client.Get(ctx, groupPath, "", api.OrderedValues{{[]byte("resume"), []byte(resume)}}, nil, &groups) - return + return groups, err } // GetIsiGroupMembers retrieves the members of a group. @@ -110,13 +110,13 @@ func GetIsiGroupMembers(ctx context.Context, client api.Client, groupName *strin authGroupID, err := getAuthMemberID(fileGroupTypeGroup, groupName, gid) if err != nil { - return + return members, err } var groupMemberListResp *IsiGroupMemberListRespResume // First call without Resume param if err = client.Get(ctx, fmt.Sprintf(groupMemberPath, authGroupID), "", nil, nil, &groupMemberListResp); err != nil { - return + return members, err } for { @@ -129,13 +129,13 @@ func GetIsiGroupMembers(ctx context.Context, client api.Client, groupName *strin return nil, err } } - return + return members, err } // getIsiGroupMemberListWithResume queries the next page group members based on resume token. func getIsiGroupMemberListWithResume(ctx context.Context, client api.Client, groupID, resume string) (members *IsiGroupMemberListRespResume, err error) { err = client.Get(ctx, fmt.Sprintf(groupMemberPath, groupID), "", api.OrderedValues{{[]byte("resume"), []byte(resume)}}, nil, &members) - return + return members, err } // AddIsiGroupMember adds a member to the group, member can be a user/group. @@ -274,7 +274,7 @@ func UpdateIsiGroupGID(ctx context.Context, client api.Client, groupName *string authGroupID, err := getAuthMemberID(fileGroupTypeGroup, groupName, gid) if err != nil { - return + return err } return client.Put(ctx, groupPath, authGroupID, values, nil, &IsiUpdateGroupReq{newGid}, nil) @@ -285,7 +285,7 @@ func DeleteIsiGroup(ctx context.Context, client api.Client, groupName *string, g // PAPI call: DELETE https://1.2.3.4:8080/platform/1/auth/groups/ authGroupID, err := getAuthMemberID(fileGroupTypeGroup, groupName, gid) if err != nil { - return + return err } return client.Delete(ctx, groupPath, authGroupID, nil, nil, nil) diff --git a/api/v1/api_v1_user_groups_test.go b/api/v1/api_v1_user_groups_test.go index b998c696..a6b7dcf6 100644 --- a/api/v1/api_v1_user_groups_test.go +++ b/api/v1/api_v1_user_groups_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" ) diff --git a/api/v1/api_v1_users.go b/api/v1/api_v1_users.go index bf4190c2..e012e97c 100644 --- a/api/v1/api_v1_users.go +++ b/api/v1/api_v1_users.go @@ -19,7 +19,7 @@ import ( "context" "fmt" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // GetIsiUser queries the user by user user-id. @@ -28,17 +28,17 @@ func GetIsiUser(ctx context.Context, client api.Client, userName *string, uid *i authUserID, err := getAuthMemberID(fileGroupTypeUser, userName, uid) if err != nil { - return + return user, err } var userListResp *IsiUserListResp if err = client.Get(ctx, userPath, authUserID, nil, nil, &userListResp); err != nil { - return + return user, err } if userListResp.Users != nil && len(userListResp.Users) > 0 { user = userListResp.Users[0] - return + return user, err } return nil, fmt.Errorf("user not found: %s", authUserID) @@ -81,7 +81,7 @@ func GetIsiUserList(ctx context.Context, client api.Client, var userListResp *IsiUserListRespResume // First call without Resume param if err = client.Get(ctx, userPath, "", values, nil, &userListResp); err != nil { - return + return users, err } for { users = append(users, userListResp.Users...) @@ -93,13 +93,13 @@ func GetIsiUserList(ctx context.Context, client api.Client, return nil, err } } - return + return users, err } // getIsiUserListWithResume queries the next page users based on resume token. func getIsiUserListWithResume(ctx context.Context, client api.Client, resume string) (users *IsiUserListRespResume, err error) { err = client.Get(ctx, userPath, "", api.OrderedValues{{[]byte("resume"), []byte(resume)}}, nil, &users) - return + return users, err } // CreateIsiUser creates a new user. @@ -205,7 +205,7 @@ func UpdateIsiUser(ctx context.Context, client api.Client, userName *string, uid // } authUserID, err := getAuthMemberID(fileGroupTypeUser, userName, uid) if err != nil { - return + return err } values := api.OrderedValues{} @@ -256,7 +256,7 @@ func DeleteIsiUser(ctx context.Context, client api.Client, userName *string, uid authUserID, err := getAuthMemberID(fileGroupTypeUser, userName, uid) if err != nil { - return + return err } return client.Delete(ctx, userPath, authUserID, nil, nil, nil) diff --git a/api/v1/api_v1_users_test.go b/api/v1/api_v1_users_test.go index f7ff9b4a..eaf083b5 100644 --- a/api/v1/api_v1_users_test.go +++ b/api/v1/api_v1_users_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" ) diff --git a/api/v1/api_v1_volumes.go b/api/v1/api_v1_volumes.go index 46bd7712..e1c63290 100644 --- a/api/v1/api_v1_volumes.go +++ b/api/v1/api_v1_volumes.go @@ -19,7 +19,7 @@ import ( "context" "path" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // const defaultACL = "public_read_write" diff --git a/api/v1/api_v1_volumes_test.go b/api/v1/api_v1_volumes_test.go index 200244ef..b5192ab4 100644 --- a/api/v1/api_v1_volumes_test.go +++ b/api/v1/api_v1_volumes_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" ) diff --git a/api/v1/api_v1_zones.go b/api/v1/api_v1_zones.go index 2553e532..14033479 100644 --- a/api/v1/api_v1_zones.go +++ b/api/v1/api_v1_zones.go @@ -18,7 +18,7 @@ package v1 import ( "context" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // GetZoneByName returns a specific access zone which matches the name parsed in diff --git a/api/v1/api_v1_zones_test.go b/api/v1/api_v1_zones_test.go index b20176eb..8dd73aea 100644 --- a/api/v1/api_v1_zones_test.go +++ b/api/v1/api_v1_zones_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" ) diff --git a/api/v11/api_v11_replication.go b/api/v11/api_v11_replication.go index 2fe9cc59..56f3d9a6 100644 --- a/api/v11/api_v11_replication.go +++ b/api/v11/api_v11_replication.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) const ( diff --git a/api/v11/api_v11_replication_test.go b/api/v11/api_v11_replication_test.go index cdfc5225..c2e5790c 100644 --- a/api/v11/api_v11_replication_test.go +++ b/api/v11/api_v11_replication_test.go @@ -21,8 +21,8 @@ import ( "errors" "testing" - "github.com/dell/goisilon/api" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/api" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/api/v12/api_v12_smb_shares.go b/api/v12/api_v12_smb_shares.go index 0b1e1829..0b1c08ef 100644 --- a/api/v12/api_v12_smb_shares.go +++ b/api/v12/api_v12_smb_shares.go @@ -18,8 +18,8 @@ package v12 import ( "context" - "github.com/dell/goisilon/api" - "github.com/dell/goisilon/openapi" + "github.com/dell/gopowerscale/api" + "github.com/dell/gopowerscale/openapi" ) const sharesPath = "/platform/12/protocols/smb/shares" diff --git a/api/v12/api_v12_smb_shares_test.go b/api/v12/api_v12_smb_shares_test.go index 11aa922b..c73cda82 100644 --- a/api/v12/api_v12_smb_shares_test.go +++ b/api/v12/api_v12_smb_shares_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/api/v14/api_v14_cluster.go b/api/v14/api_v14_cluster.go index 66437577..51a0291f 100644 --- a/api/v14/api_v14_cluster.go +++ b/api/v14/api_v14_cluster.go @@ -3,7 +3,7 @@ package v14 import ( "context" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // GetIsiClusterAcs queries ACS status of OneFS cluster diff --git a/api/v14/api_v14_cluster_test.go b/api/v14/api_v14_cluster_test.go index 5c67b15b..038861b4 100644 --- a/api/v14/api_v14_cluster_test.go +++ b/api/v14/api_v14_cluster_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" ) diff --git a/api/v2/api_v2.go b/api/v2/api_v2.go index 2159b899..0b9dafbf 100644 --- a/api/v2/api_v2.go +++ b/api/v2/api_v2.go @@ -21,7 +21,7 @@ import ( "strconv" "strings" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) const ( diff --git a/api/v2/api_v2_acls.go b/api/v2/api_v2_acls.go index bfe7e2b0..f9347319 100644 --- a/api/v2/api_v2_acls.go +++ b/api/v2/api_v2_acls.go @@ -24,7 +24,7 @@ import ( "strconv" "strings" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // AuthoritativeType is a possible value used with an ACL's Authoritative field. diff --git a/api/v2/api_v2_acls_test.go b/api/v2/api_v2_acls_test.go index 65840e95..6314eea9 100644 --- a/api/v2/api_v2_acls_test.go +++ b/api/v2/api_v2_acls_test.go @@ -21,7 +21,7 @@ import ( "errors" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" ) diff --git a/api/v2/api_v2_exports.go b/api/v2/api_v2_exports.go index 5c691be6..c27fe43b 100644 --- a/api/v2/api_v2_exports.go +++ b/api/v2/api_v2_exports.go @@ -21,7 +21,7 @@ import ( "errors" "strconv" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) type ExportReq struct { diff --git a/api/v2/api_v2_exports_test.go b/api/v2/api_v2_exports_test.go index b6bef372..b11e7718 100644 --- a/api/v2/api_v2_exports_test.go +++ b/api/v2/api_v2_exports_test.go @@ -23,8 +23,8 @@ import ( "os" "testing" - "github.com/dell/goisilon/api" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/api" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/api/v2/api_v2_fs.go b/api/v2/api_v2_fs.go index e17791a2..81aa8ba2 100644 --- a/api/v2/api_v2_fs.go +++ b/api/v2/api_v2_fs.go @@ -24,7 +24,7 @@ import ( "strings" "sync" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // ContainerChild is a child object of a container. diff --git a/api/v2/api_v2_fs_test.go b/api/v2/api_v2_fs_test.go index d29f90a7..a96f2b5f 100644 --- a/api/v2/api_v2_fs_test.go +++ b/api/v2/api_v2_fs_test.go @@ -22,7 +22,7 @@ import ( "errors" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" ) diff --git a/api/v2/api_v2_test.go b/api/v2/api_v2_test.go index 7a02d9fc..8efb6c1b 100644 --- a/api/v2/api_v2_test.go +++ b/api/v2/api_v2_test.go @@ -19,8 +19,8 @@ package v2 import ( "testing" - "github.com/dell/goisilon/api" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/api" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" ) diff --git a/api/v3/api_v3_cluster.go b/api/v3/api_v3_cluster.go index 61bf5c8e..b3664827 100644 --- a/api/v3/api_v3_cluster.go +++ b/api/v3/api_v3_cluster.go @@ -20,7 +20,7 @@ import ( "fmt" "strings" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // constants diff --git a/api/v3/api_v3_cluster_test.go b/api/v3/api_v3_cluster_test.go index f2e6387a..36b305ab 100644 --- a/api/v3/api_v3_cluster_test.go +++ b/api/v3/api_v3_cluster_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/api/v4/api_v4_nfs_exports.go b/api/v4/api_v4_nfs_exports.go index 38eb1cbb..d60cafdd 100644 --- a/api/v4/api_v4_nfs_exports.go +++ b/api/v4/api_v4_nfs_exports.go @@ -18,8 +18,8 @@ package v4 import ( "context" - "github.com/dell/goisilon/api" - "github.com/dell/goisilon/openapi" + "github.com/dell/gopowerscale/api" + "github.com/dell/gopowerscale/openapi" ) const exportsPath = "/platform/4/protocols/nfs/exports" diff --git a/api/v4/api_v4_nfs_exports_test.go b/api/v4/api_v4_nfs_exports_test.go index 569d469f..325390cc 100644 --- a/api/v4/api_v4_nfs_exports_test.go +++ b/api/v4/api_v4_nfs_exports_test.go @@ -20,7 +20,7 @@ import ( "errors" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/api/v5/api_v5_quotas.go b/api/v5/api_v5_quotas.go index ac0ec030..d3155102 100644 --- a/api/v5/api_v5_quotas.go +++ b/api/v5/api_v5_quotas.go @@ -20,8 +20,8 @@ import ( "errors" "fmt" - log "github.com/akutz/gournal" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" + log "github.com/sirupsen/logrus" ) const ( diff --git a/api/v5/api_v5_quotas_test.go b/api/v5/api_v5_quotas_test.go index a940423c..ae95b163 100644 --- a/api/v5/api_v5_quotas_test.go +++ b/api/v5/api_v5_quotas_test.go @@ -21,7 +21,7 @@ import ( "fmt" "testing" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/api/v7/api_v7_cluster.go b/api/v7/api_v7_cluster.go index 9d00e49a..f8b7ca69 100644 --- a/api/v7/api_v7_cluster.go +++ b/api/v7/api_v7_cluster.go @@ -3,7 +3,7 @@ package v7 import ( "context" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // GetIsiClusterInternalNetworks queries internal networks settings diff --git a/api/v7/api_v7_cluster_test.go b/api/v7/api_v7_cluster_test.go index 5540f8a9..4f807a69 100644 --- a/api/v7/api_v7_cluster_test.go +++ b/api/v7/api_v7_cluster_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" ) diff --git a/client.go b/client.go index 02a2f1b2..1a6b4286 100644 --- a/client.go +++ b/client.go @@ -13,7 +13,7 @@ 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" @@ -21,7 +21,7 @@ import ( "strconv" "time" - "github.com/dell/goisilon/api" + "github.com/dell/gopowerscale/api" ) // Client is an Isilon client. diff --git a/client_test.go b/client_test.go index c591bd6a..aaef2adb 100644 --- a/client_test.go +++ b/client_test.go @@ -13,7 +13,7 @@ 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" diff --git a/cluster.go b/cluster.go index b4c4ffd1..70e1f551 100644 --- a/cluster.go +++ b/cluster.go @@ -13,14 +13,14 @@ 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" - apiv14 "github.com/dell/goisilon/api/v14" - apiv3 "github.com/dell/goisilon/api/v3" - apiv7 "github.com/dell/goisilon/api/v7" + apiv14 "github.com/dell/gopowerscale/api/v14" + apiv3 "github.com/dell/gopowerscale/api/v3" + apiv7 "github.com/dell/gopowerscale/api/v7" ) // Stats is Isilon statistics data structure . diff --git a/cluster_test.go b/cluster_test.go index ea1d7201..6859e186 100644 --- a/cluster_test.go +++ b/cluster_test.go @@ -13,14 +13,14 @@ 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 ( "errors" "testing" - apiv3 "github.com/dell/goisilon/api/v3" - "github.com/dell/goisilon/mocks" + apiv3 "github.com/dell/gopowerscale/api/v3" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/env.sh b/env.sh index 26fe6308..2f4b2cec 100644 --- a/env.sh +++ b/env.sh @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License -# Configuration file for goisilon tests +# Configuration file for gopowerscale tests GOISILON_ENDPOINT="https://1.1.1.0:8080" GOISILON_USERNAME="admin" diff --git a/exports.go b/exports.go index 4107d20a..81b79b3d 100644 --- a/exports.go +++ b/exports.go @@ -13,19 +13,19 @@ 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" "errors" - apiv4 "github.com/dell/goisilon/api/v4" - "github.com/dell/goisilon/openapi" + apiv4 "github.com/dell/gopowerscale/api/v4" + "github.com/dell/gopowerscale/openapi" - api "github.com/dell/goisilon/api" - str "github.com/dell/goisilon/api/common/utils/stringutils" - apiv1 "github.com/dell/goisilon/api/v1" - apiv2 "github.com/dell/goisilon/api/v2" + api "github.com/dell/gopowerscale/api" + str "github.com/dell/gopowerscale/api/common/utils/stringutils" + apiv1 "github.com/dell/gopowerscale/api/v1" + apiv2 "github.com/dell/gopowerscale/api/v2" ) // ExportList is a list of Isilon Exports. diff --git a/exports_test.go b/exports_test.go index bdd9e5bb..b75dc3d2 100644 --- a/exports_test.go +++ b/exports_test.go @@ -13,7 +13,7 @@ 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" @@ -23,13 +23,13 @@ import ( "strconv" "testing" - log "github.com/akutz/gournal" - api "github.com/dell/goisilon/api" - apiv1 "github.com/dell/goisilon/api/v1" - apiv2 "github.com/dell/goisilon/api/v2" - apiv4 "github.com/dell/goisilon/api/v4" - "github.com/dell/goisilon/mocks" - "github.com/dell/goisilon/openapi" + api "github.com/dell/gopowerscale/api" + apiv1 "github.com/dell/gopowerscale/api/v1" + apiv2 "github.com/dell/gopowerscale/api/v2" + apiv4 "github.com/dell/gopowerscale/api/v4" + "github.com/dell/gopowerscale/mocks" + "github.com/dell/gopowerscale/openapi" + log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/go.mod b/go.mod index 4039d83c..00138517 100644 --- a/go.mod +++ b/go.mod @@ -1,20 +1,19 @@ -module github.com/dell/goisilon +module github.com/dell/gopowerscale go 1.25 require ( - github.com/PuerkitoBio/goquery v1.10.2 - github.com/akutz/gournal v0.5.0 + github.com/PuerkitoBio/goquery v1.11.0 github.com/sirupsen/logrus v1.9.3 - github.com/stretchr/testify v1.11.0 + github.com/stretchr/testify v1.11.1 ) require ( github.com/andybalholm/cascadia v1.3.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/stretchr/objx v0.5.2 // indirect - golang.org/x/net v0.38.0 // indirect - golang.org/x/sys v0.31.0 // indirect + github.com/stretchr/objx v0.5.3 // indirect + golang.org/x/net v0.47.0 // indirect + golang.org/x/sys v0.38.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index c4c0685d..50da0355 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,5 @@ -github.com/PuerkitoBio/goquery v1.10.2 h1:7fh2BdHcG6VFZsK7toXBT/Bh1z5Wmy8Q9MV9HqT2AM8= -github.com/PuerkitoBio/goquery v1.10.2/go.mod h1:0guWGjcLu9AYC7C1GHnpysHy056u9aEkUHwhdnePMCU= -github.com/akutz/gournal v0.5.0 h1:ELlKqTTp9dmaaadDvO19YxUmdMghYuSi23AxoSL/g98= -github.com/akutz/gournal v0.5.0/go.mod h1:w7Ucz8IOvtgsEL1321IY8bIUoASU/khBjAy/L6doMWc= +github.com/PuerkitoBio/goquery v1.11.0 h1:jZ7pwMQXIITcUXNH83LLk+txlaEy6NVOfTuP43xxfqw= +github.com/PuerkitoBio/goquery v1.11.0/go.mod h1:wQHgxUOU3JGuj3oD/QFfxUdlzW6xPHfqyHre6VMY4DQ= github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM= github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -13,11 +11,11 @@ github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZN github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ= github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +github.com/stretchr/objx v0.5.3 h1:jmXUvGomnU1o3W/V5h2VEradbpJDwGrzugQQvL0POH4= +github.com/stretchr/objx v0.5.3/go.mod h1:rDQraq+vQZU7Fde9LOZLr8Tax6zZvy4kuNKF+QYS+U0= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.11.0 h1:ib4sjIrwZKxE5u/Japgo/7SJV3PvgjGiRNAvTVGqQl8= -github.com/stretchr/testify v1.11.0/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= +github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= @@ -39,8 +37,8 @@ golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= -golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= -golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= +golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY= +golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -60,8 +58,8 @@ golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= -golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= +golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc= +golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/goisilon_test.go b/goisilon_test.go index 3121d01f..e34d82f4 100644 --- a/goisilon_test.go +++ b/goisilon_test.go @@ -13,7 +13,7 @@ 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" @@ -21,10 +21,9 @@ import ( "os" "testing" - log "github.com/akutz/gournal" - glogrus "github.com/akutz/gournal/logrus" - "github.com/dell/goisilon/mocks" - "github.com/sirupsen/logrus" + "github.com/dell/gopowerscale/api" + "github.com/dell/gopowerscale/mocks" + log "github.com/sirupsen/logrus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) @@ -40,11 +39,8 @@ func init() { defaultCtx = context.Background() defaultCtx = context.WithValue( defaultCtx, - log.AppenderKey(), - glogrus.NewWithOptions( - logrus.StandardLogger().Out, - logrus.DebugLevel, - logrus.StandardLogger().Formatter)) + api.LevelKey, + log.DebugLevel) } func skipTest(t *testing.T) { @@ -58,7 +54,7 @@ func TestMain(m *testing.M) { if testing.Verbose() { defaultCtx = context.WithValue( defaultCtx, - log.LevelKey(), + api.LevelKey, log.DebugLevel) } diff --git a/mkdocs.yml b/mkdocs.yml new file mode 100644 index 00000000..9eec6237 --- /dev/null +++ b/mkdocs.yml @@ -0,0 +1,7 @@ +site_name: 'gopowerscale' +site_description: 'gopowerscale Documentation.' +docs_dir: docs +plugins: + - techdocs-core +theme: + name: material diff --git a/mocks/Client.go b/mocks/Client.go index 7903fa6a..837645f9 100644 --- a/mocks/Client.go +++ b/mocks/Client.go @@ -5,7 +5,7 @@ package mocks import ( context "context" - api "github.com/dell/goisilon/api" + api "github.com/dell/gopowerscale/api" mock "github.com/stretchr/testify/mock" ) diff --git a/quota.go b/quota.go index 9f6635d8..515ebe01 100644 --- a/quota.go +++ b/quota.go @@ -13,13 +13,13 @@ 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/v1" - apiV5 "github.com/dell/goisilon/api/v5" + api "github.com/dell/gopowerscale/api/v1" + apiV5 "github.com/dell/gopowerscale/api/v5" ) // Quota maps to an Isilon filesystem quota. diff --git a/quota_test.go b/quota_test.go index 65e74bdc..b8eac021 100644 --- a/quota_test.go +++ b/quota_test.go @@ -13,14 +13,14 @@ 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 ( "fmt" "testing" - apiv1 "github.com/dell/goisilon/api/v1" - "github.com/dell/goisilon/mocks" + apiv1 "github.com/dell/gopowerscale/api/v1" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/replication.go b/replication.go index fa57dd26..eb9e2821 100644 --- a/replication.go +++ b/replication.go @@ -1,4 +1,4 @@ -package goisilon +package gopowerscale /* Copyright (c) 2021-2023 Dell Inc, or its subsidiaries. @@ -23,9 +23,9 @@ import ( "strings" "time" - log "github.com/akutz/gournal" - "github.com/dell/goisilon/api/common/utils/poll" - apiv11 "github.com/dell/goisilon/api/v11" + "github.com/dell/gopowerscale/api/common/utils/poll" + apiv11 "github.com/dell/gopowerscale/api/v11" + log "github.com/sirupsen/logrus" ) const ( diff --git a/replication_test.go b/replication_test.go index 2413aa76..97335801 100644 --- a/replication_test.go +++ b/replication_test.go @@ -11,7 +11,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package goisilon +package gopowerscale import ( "context" @@ -19,9 +19,9 @@ import ( "fmt" "testing" - "github.com/dell/goisilon/api" - apiv11 "github.com/dell/goisilon/api/v11" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/api" + apiv11 "github.com/dell/gopowerscale/api/v11" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/role.go b/role.go index 7aec4954..6b7f7e54 100644 --- a/role.go +++ b/role.go @@ -14,14 +14,14 @@ See the License for the specific language governing permissions and limitations under the License. */ -package goisilon +package gopowerscale import ( "context" "fmt" "strings" - api "github.com/dell/goisilon/api/v1" + api "github.com/dell/gopowerscale/api/v1" ) // User maps to an Isilon Role. diff --git a/role_test.go b/role_test.go index c8da9bb7..ee0231b1 100644 --- a/role_test.go +++ b/role_test.go @@ -13,15 +13,15 @@ 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" "fmt" "testing" - apiv1 "github.com/dell/goisilon/api/v1" - "github.com/dell/goisilon/mocks" + apiv1 "github.com/dell/gopowerscale/api/v1" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/shares.go b/shares.go index 7e396a0e..d6790ebc 100644 --- a/shares.go +++ b/shares.go @@ -13,13 +13,13 @@ 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" - apiv12 "github.com/dell/goisilon/api/v12" - "github.com/dell/goisilon/openapi" + apiv12 "github.com/dell/gopowerscale/api/v12" + "github.com/dell/gopowerscale/openapi" ) // ListALlSmbSharesWithStructParams returns all the smb shares with params diff --git a/shares_test.go b/shares_test.go index b57807eb..4aadaa11 100644 --- a/shares_test.go +++ b/shares_test.go @@ -13,15 +13,15 @@ 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 ( "fmt" "testing" - v12 "github.com/dell/goisilon/api/v12" - "github.com/dell/goisilon/mocks" - "github.com/dell/goisilon/openapi" + v12 "github.com/dell/gopowerscale/api/v12" + "github.com/dell/gopowerscale/mocks" + "github.com/dell/gopowerscale/openapi" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/snapshots.go b/snapshots.go index 95d2e2e2..d3a0b791 100644 --- a/snapshots.go +++ b/snapshots.go @@ -13,7 +13,7 @@ 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 ( "bytes" @@ -24,7 +24,7 @@ import ( "strconv" "strings" - api "github.com/dell/goisilon/api/v1" + api "github.com/dell/gopowerscale/api/v1" ) const ( diff --git a/snapshots_test.go b/snapshots_test.go index 8baf2c7e..bab3566f 100644 --- a/snapshots_test.go +++ b/snapshots_test.go @@ -13,7 +13,7 @@ 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" @@ -21,8 +21,8 @@ import ( "fmt" "testing" - apiv1 "github.com/dell/goisilon/api/v1" - "github.com/dell/goisilon/mocks" + apiv1 "github.com/dell/gopowerscale/api/v1" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/user.go b/user.go index dd5b04e4..f1cf9e46 100644 --- a/user.go +++ b/user.go @@ -14,12 +14,12 @@ 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/v1" + api "github.com/dell/gopowerscale/api/v1" ) // User maps to an Isilon User. diff --git a/user_group.go b/user_group.go index 78f80192..334e8c53 100644 --- a/user_group.go +++ b/user_group.go @@ -14,12 +14,12 @@ 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/v1" + api "github.com/dell/gopowerscale/api/v1" ) // Group maps to an Isilon Group. diff --git a/user_group_test.go b/user_group_test.go index 5c63c29b..6c0ce685 100644 --- a/user_group_test.go +++ b/user_group_test.go @@ -13,17 +13,17 @@ 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" - api "github.com/dell/goisilon/api/v1" - apiv1 "github.com/dell/goisilon/api/v1" + api "github.com/dell/gopowerscale/api/v1" + apiv1 "github.com/dell/gopowerscale/api/v1" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/dell/goisilon/mocks" + "github.com/dell/gopowerscale/mocks" ) // Test GetAllGroups() and GetGroupsWithFilter() diff --git a/user_test.go b/user_test.go index f81aaa1f..102ee7b4 100644 --- a/user_test.go +++ b/user_test.go @@ -13,15 +13,15 @@ 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" "fmt" "testing" - apiv1 "github.com/dell/goisilon/api/v1" - "github.com/dell/goisilon/mocks" + apiv1 "github.com/dell/gopowerscale/api/v1" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/volume.go b/volume.go index cb7ea65e..a06afb7b 100644 --- a/volume.go +++ b/volume.go @@ -13,7 +13,7 @@ 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" @@ -24,9 +24,9 @@ import ( "strings" "sync" - log "github.com/akutz/gournal" - apiv1 "github.com/dell/goisilon/api/v1" - apiv2 "github.com/dell/goisilon/api/v2" + apiv1 "github.com/dell/gopowerscale/api/v1" + apiv2 "github.com/dell/gopowerscale/api/v2" + log "github.com/sirupsen/logrus" ) // Volume represents an Isilon Volume (namespace API). diff --git a/volume_test.go b/volume_test.go index f2502eed..b9cc4a2d 100644 --- a/volume_test.go +++ b/volume_test.go @@ -13,7 +13,7 @@ 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 ( "bytes" @@ -23,9 +23,9 @@ import ( "path" "testing" - apiv1 "github.com/dell/goisilon/api/v1" - apiv2 "github.com/dell/goisilon/api/v2" - "github.com/dell/goisilon/mocks" + apiv1 "github.com/dell/gopowerscale/api/v1" + apiv2 "github.com/dell/gopowerscale/api/v2" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/zones.go b/zones.go index 08353a9f..7f42acb2 100644 --- a/zones.go +++ b/zones.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" - apiv1 "github.com/dell/goisilon/api/v1" + apiv1 "github.com/dell/gopowerscale/api/v1" ) // GetZoneByName returns a specific access zone which matched the name diff --git a/zones_test.go b/zones_test.go index 7b47229c..8be9a66a 100644 --- a/zones_test.go +++ b/zones_test.go @@ -13,14 +13,14 @@ 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" "testing" - apiv1 "github.com/dell/goisilon/api/v1" - "github.com/dell/goisilon/mocks" + apiv1 "github.com/dell/gopowerscale/api/v1" + "github.com/dell/gopowerscale/mocks" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" )