PC-9562 Rename group resource to usergroup (#59)

* PC-9562 Rename group resource to user-group

* PC-9562 Kind proper declarations

objects.go

@@ -27,7 +27,7 @@ const (
 	KindAlertMethod = "AlertMethod"
 	KindDirect      = "Direct"
 	KindDataExport  = "DataExport"
-	KindGroup       = "Group"
+	KindUserGroup   = "UserGroup"
 	KindRoleBinding = "RoleBinding"
 )
 
@@ -44,7 +44,7 @@ type APIObjects struct {
 	DataExports   []DataExport
 	Projects      []Project
 	RoleBindings  []RoleBinding
-	Groups        []Group
+	UserGroups    []UserGroup
 }
 
 type Payload struct {
@@ -202,12 +202,12 @@ func Parse(o ObjectGeneric, parsedObjects *APIObjects, onlyHeaders bool) error {
 			allErrors = append(allErrors, err.Error())
 		}
 		parsedObjects.RoleBindings = append(parsedObjects.RoleBindings, roleBinding)
-	case KindGroup:
-		group, err := genericToGroup(o)
+	case KindUserGroup:
+		group, err := genericToUserGroup(o)
 		if err != nil {
 			allErrors = append(allErrors, err.Error())
 		}
-		parsedObjects.Groups = append(parsedObjects.Groups, group)
+		parsedObjects.UserGroups = append(parsedObjects.UserGroups, group)
 	// catching invalid kinds of objects for this apiVersion
 	default:
 		err := UnsupportedKindErr(o)

sdk/client.go

@@ -252,7 +252,7 @@ func (c *Client) GetObjectsWithParams(
 
 func (c *Client) resolveGetObjectEndpoint(kind Kind) string {
 	switch kind {
-	case KindGroup:
+	case KindUserGroup:
 		return apiGetGroups
 	default:
 		return path.Join(apiGet, kind.ToLower())

sdk/client_test.go

@@ -92,7 +92,7 @@ func TestClient_GetObjects_GroupsEndpoint(t *testing.T) {
 	defer srv.Close()
 
 	// Run the API method.
-	_, err := client.GetObjects(context.Background(), "", KindGroup, nil)
+	_, err := client.GetObjects(context.Background(), "", KindUserGroup, nil)
 	// Verify response handling.
 	require.NoError(t, err)
 	assert.Equal(t, 1, calledTimes)

sdk/definitions/metadata.go

@@ -40,7 +40,7 @@ func (ma MetadataAnnotations) AnnotateObject(object sdk.AnyJSONObj) (sdk.AnyJSON
 		return nil, err
 	}
 	switch kind {
-	case sdk.KindProject, sdk.KindRoleBinding, sdk.KindGroup:
+	case sdk.KindProject, sdk.KindRoleBinding, sdk.KindUserGroup:
 		// Do not append the project name.
 	default:
 		if meta["project"] == nil && ma.Project != "" {

sdk/kind.go

@@ -21,7 +21,7 @@ UsageSummary
 RoleBinding
 SLOErrorBudgetStatus
 Annotation
-Group
+UserGroup
 )*/
 type Kind int
 

groups.go → user_groups.go

@@ -4,16 +4,16 @@ import (
 	"encoding/json"
 )
 
-type Group struct {
+type UserGroup struct {
 	ObjectInternal
 	APIVersion string        `json:"apiVersion" validate:"required" example:"n9/v1alpha"`
 	Kind       string        `json:"kind" validate:"required" example:"kind"`
 	Metadata   GroupMetadata `json:"metadata"`
-	Spec       GroupSpec     `json:"spec"`
+	Spec       UserGroupSpec `json:"spec"`
 }
 
-// GroupSpec represents content of Group's Spec
-type GroupSpec struct {
+// UserGroupSpec represents content of UserGroup's Spec
+type UserGroupSpec struct {
 	DisplayName string   `json:"displayName"`
 	Members     []Member `json:"members"`
 }
@@ -26,9 +26,9 @@ type GroupMetadata struct {
 	Name string `json:"name" validate:"required,objectName" example:"name"`
 }
 
-// genericToGroup converts ObjectGeneric to Group object
-func genericToGroup(o ObjectGeneric) (Group, error) {
-	res := Group{
+// genericToUserGroup converts ObjectGeneric to UserGroup object
+func genericToUserGroup(o ObjectGeneric) (UserGroup, error) {
+	res := UserGroup{
 		APIVersion: o.ObjectHeader.APIVersion,
 		Kind:       o.ObjectHeader.Kind,
 		Metadata: GroupMetadata{
@@ -39,7 +39,7 @@ func genericToGroup(o ObjectGeneric) (Group, error) {
 			ManifestSrc:  o.ObjectHeader.ManifestSrc,
 		},
 	}
-	var resSpec GroupSpec
+	var resSpec UserGroupSpec
 	if err := json.Unmarshal(o.Spec, &resSpec); err != nil {
 		err = EnhanceError(o, err)
 		return res, err