working commit

test/account_test.go

@@ -16,6 +16,7 @@ import (
 	"testing"
 	"time"
 
+	"mstore/app/descr"
 	"mstore/app/server"
 	"mstore/pkg/client"
 
@@ -87,6 +88,90 @@ func TestAccountLife(t *testing.T) {
 		accountID, err = cli.CreateAccount(ctx, srvaddr, username, password)
 		require.NoError(t, err)
 	}
+	var grantID string
+	{
+		// CreateGrant
+		fmt.Printf("=== CreateGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		grantID, err = cli.CreateGrant(ctx, srvaddr, accountID, descr.RightReadAccounts, "*")
+		require.NoError(t, err)
+		require.Equal(t, len(grantID), 36)
+	}
+	{
+		// UpdateGrant
+		fmt.Printf("=== UpdateGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		err := cli.UpdateGrant(ctx, srvaddr, grantID, "**")
+		require.NoError(t, err)
+	}
+	{
+		// CreateGrant
+		fmt.Printf("=== CreateGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		grantID, err = cli.CreateGrant(ctx, srvaddr, accountID, descr.RightWriteAccounts, "*")
+		require.NoError(t, err)
+		require.Equal(t, len(grantID), 36)
+		fmt.Printf("grantID: %s\n", grantID)
+	}
+	{
+		// GetGrant
+		fmt.Printf("=== GetGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		grantDescr, err := cli.GetGrant(ctx, srvaddr, grantID)
+		require.NoError(t, err)
+		require.Equal(t, len(grantID), 36)
+		fmt.Printf("grantID: %s\n", grantID)
+		grantYAML, err := yaml.Marshal(grantDescr)
+		require.NoError(t, err)
+		fmt.Printf("account:\n%s\n", string(grantYAML))
+	}
+	{
+		// UpdateGrant
+		fmt.Printf("=== UpdateGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		err := cli.UpdateGrant(ctx, srvaddr, grantID, "**")
+		require.NoError(t, err)
+	}
+	{
+		// GetGrant
+		fmt.Printf("=== GetGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		grantDescr, err := cli.GetGrant(ctx, srvaddr, grantID)
+		require.NoError(t, err)
+		require.Equal(t, len(grantID), 36)
+		fmt.Printf("grantID: %s\n", grantID)
+		grantYAML, err := yaml.Marshal(grantDescr)
+		require.NoError(t, err)
+		fmt.Printf("account:\n%s\n", string(grantYAML))
+	}
+	{
+		// DeleteGrant
+		fmt.Printf("=== DeleteGrant ===\n")
+		cli := client.NewClient()
+		ctx := context.Background()
+		ctx, _ = context.WithTimeout(ctx, 1*time.Second)
+
+		err := cli.DeleteGrant(ctx, srvaddr, grantID)
+		require.NoError(t, err)
+	}
 	{
 		// GetAccount
 		fmt.Printf("=== GetAccount ===\n")
@@ -97,6 +182,7 @@ func TestAccountLife(t *testing.T) {
 		accountDescr, err := cli.GetAccountByID(ctx, srvaddr, accountID)
 		require.NoError(t, err)
 		accountYAML, err := yaml.Marshal(accountDescr)
+		require.NoError(t, err)
 		fmt.Printf("account:\n%s\n", string(accountYAML))
 	}
 	{
@@ -109,7 +195,11 @@ func TestAccountLife(t *testing.T) {
 		accountDescrs, err := cli.ListAccounts(ctx, srvaddr+"/")
 		require.NoError(t, err)
 		require.NotZero(t, len(accountDescrs))
-		accountsYAML, err := yaml.Marshal(accountDescrs)
+		nameList := make([]string, 0)
+		for _, item := range accountDescrs {
+			nameList = append(nameList, item.Username)
+		}
+		accountsYAML, err := yaml.Marshal(nameList)
 		fmt.Printf("accounts:\n%s\n", string(accountsYAML))
 
 	}

test/image_test.go

@@ -23,7 +23,7 @@ import (
 	"sigs.k8s.io/yaml"
 )
 
-func xxxTestImageLife(t *testing.T) {
+func TestImageLife(t *testing.T) {
 	var srvport int64 = 10250
 	srvdir := t.TempDir()
 	srvaddr := fmt.Sprintf("127.0.0.1:%d", srvport)