start fixing policy tests

Author: Alevsk

models/add_policy_request.go

@@ -86,8 +86,11 @@ func listPolicies(ctx context.Context, client MinioAdmin) ([]*models.Policy, err
 	if err != nil {
 		return nil, err
 	}
-	for _, policy := range policyMap {
-		policy := parsePolicy(policy)
+	for name, policy := range policyMap {
+		policy, err := parsePolicy(name, policy)
+		if err != nil {
+			return nil, err
+		}
 		policies = append(policies, policy)
 	}
 	return policies, nil
@@ -154,7 +157,7 @@ func getRemovePolicyResponse(params admin_api.RemovePolicyParams) error {
 // addPolicy() takes name and policy in string format, policy
 // policy must be string in json format, in the future this will change
 // to a Policy struct{} - https://github.com/minio/minio/issues/9171
-func addPolicy(ctx context.Context, client MinioAdmin, name string, policy *models.Policy) (*models.Policy, error) {
+func addPolicy(ctx context.Context, client MinioAdmin, name, policy string) (*models.Policy, error) {
 	policyB, err := json.Marshal(policy)
 	if err != nil {
 		return nil, err
@@ -189,7 +192,7 @@ func getAddPolicyResponse(params *models.AddPolicyRequest) (*models.Policy, erro
 	// create a MinIO Admin Client interface implementation
 	// defining the client to be used
 	adminClient := adminClient{client: mAdmin}
-	policy, err := addPolicy(ctx, adminClient, *params.Name, params.Policy)
+	policy, err := addPolicy(ctx, adminClient, *params.Name, *params.Policy)
 	if err != nil {
 		log.Println("error adding policy")
 		return nil, err
@@ -206,7 +209,10 @@ func policyInfo(ctx context.Context, client MinioAdmin, name string) (*models.Po
 	if err != nil {
 		return nil, err
 	}
-	policy := parsePolicy(policyRaw)
+	policy, err := parsePolicy(name, policyRaw)
+	if err != nil {
+		return nil, err
+	}
 	return policy, nil
 }
 
@@ -265,23 +271,14 @@ func getSetPolicyResponse(name string, params *models.SetPolicyRequest) error {
 }
 
 // parsePolicy() converts from *rawPolicy to *models.Policy
-// Iterates over the raw statements and copied them to models.policy
-func parsePolicy(rawPolicy *iampolicy.Policy) *models.Policy {
-	var statements []*models.PolicyStatement
-	for _, rawStatement := range rawPolicy.Statements {
-		statement := &models.PolicyStatement{
-			Sid:       string(rawStatement.SID),
-			Action:    rawStatement.Actions.String(),
-			Effect:    string(rawStatement.Effect),
-			Resource:  rawStatement.Resources.String(),
-			Condition: rawStatement.Conditions.String(),
-		}
-		statements = append(statements, statement)
+func parsePolicy(name string, rawPolicy *iampolicy.Policy) (*models.Policy, error) {
+	stringPolicy, err := json.Marshal(rawPolicy)
+	if err != nil {
+		return nil, err
 	}
 	policy := &models.Policy{
-		ID:         string(rawPolicy.ID),
-		Version:    rawPolicy.Version,
-		Statements: statements,
+		Name: name,
+		Policy: string(stringPolicy),
 	}
-	return policy
+	return policy, nil
 }

models/policy.go

@@ -29,10 +29,10 @@ import (
 )
 
 // assigning mock at runtime instead of compile time
-var minioListPoliciesMock func() (map[string][]byte, error)
-var minioGetPolicyMock func(name string) ([]byte, error)
+var minioListPoliciesMock func() (map[string]*iampolicy.Policy, error)
+var minioGetPolicyMock func(name string) (*iampolicy.Policy , error)
 var minioRemovePolicyMock func(name string) error
-var minioAddPolicyMock func(name, policy string) error
+var minioAddPolicyMock func(name string, policy *iampolicy.Policy) error
 var minioSetPolicyMock func(policyName, entityName string, isGroup bool) error
 
 // mock function of listPolicies()
@@ -84,7 +84,7 @@ func TestListPolicies(t *testing.T) {
 		},
 	}
 	// mock function response from listPolicies()
-	minioListPoliciesMock = func() (map[string][]byte, error) {
+	minioListPoliciesMock = func() (map[string]*iampolicy.Policy, error) {
 		return mockPoliciesList, nil
 	}
 	// Test-1 : listPolicies() Get response from minio client with three Canned Policies and return the same number on listPolicies()
@@ -106,7 +106,7 @@ func TestListPolicies(t *testing.T) {
 		assert.Equal(policy.Policy, assertPolicy.Policy)
 	}
 	// Test-3 : listPolicies() Return error and see that the error is handled correctly and returned
-	minioListPoliciesMock = func() (map[string][]byte, error) {
+	minioListPoliciesMock = func() (map[string]*iampolicy.Policy, error) {
 		return nil, errors.New("error")
 	}
 	_, err = listPolicies(ctx, adminClient)
@@ -144,10 +144,10 @@ func TestAddPolicy(t *testing.T) {
 	adminClient := adminClientMock{}
 	policyName := "new-policy"
 	policyDefinition := "{\"Version\":\"2012-10-17\",\"Statement\":[{\"Effect\":\"Allow\",\"Action\":[\"s3:GetBucketLocation\",\"s3:GetObject\",\"s3:ListAllMyBuckets\"],\"Resource\":[\"arn:aws:s3:::*\"]}]}"
-	minioAddPolicyMock = func(name, policy string) error {
+	minioAddPolicyMock = func(name string, policy *iampolicy.Policy) error {
 		return nil
 	}
-	minioGetPolicyMock = func(name string) (bytes []byte, err error) {
+	minioGetPolicyMock = func(name string) (*iampolicy.Policy , error) {
 		return []byte(policyDefinition), nil
 	}
 	assertPolicy := models.Policy{
@@ -163,7 +163,7 @@ func TestAddPolicy(t *testing.T) {
 	assert.Equal(policy.Name, assertPolicy.Name)
 	assert.Equal(policy.Policy, assertPolicy.Policy)
 	// Test-2 : addPolicy() got an error while adding policy
-	minioAddPolicyMock = func(name, policy string) error {
+	minioAddPolicyMock = func(name string, policy *iampolicy.Policy) error {
 		return errors.New("error")
 	}
 	if _, err := addPolicy(ctx, adminClient, policyName, policyDefinition); assert.Error(err) {

models/policy_statement.go

@@ -955,28 +955,9 @@ definitions:
   policy:
     type: object
     properties:
-      ID:
-        type: string
-      Version:
-        type: string
-      Statements:
-        $ref: "#/definitions/policyStatements"
-  policyStatements:
-    type: array
-    items:
-      $ref: "#/definitions/policyStatement"
-  policyStatement:
-    type: object
-    properties:
-      Sid:
-        type: string
-      Effect: 
-        type: string
-      Action:
-        type: string
-      Resource:
+      name:
         type: string
-      Condition:
+      policy:
         type: string
   policyEntity:
     type: string
@@ -1003,7 +984,7 @@ definitions:
       name:
         type: string
       policy:
-        $ref: "#/definitions/policy"
+        type: string
   listPoliciesResponse:
     type: object
     properties: