Kept historical resource naming after renaming in activity for shares…

[2403905]

… and public links.

Description

Related Issue

• Fixes <issue_link>

Motivation and Context

How Has This Been Tested?

• test environment:
• test case 1:
• test case 2:
• ...

Screenshots (if appropriate):

Types of changes

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to change)
• Technical debt
• Tests only (no source changes)

Checklist:

• Code changes
• Unit tests added
• Acceptance tests added
• Documentation ticket raised:

[2403905]

@SagarGi Could you have a look tests error output https://drone.owncloud.com/owncloud/ocis/39752/38/6
There are similar errors related to ... emplate.properties.message mismatch but in the output i see different Received

[2403905]

There are many misleading errors like below that were produced after the code changes because the json schema in a test case contains the redundant required elements.

The pattern "{user} updated {field} for a link {token} on {resource}" expects 4 requered fields, but the jcon schema expects 5 "required": ["field","folder","resource","token","user"]

And the test produce misled error....

ERROR IN A CI
      2. properties.value.items.2.oneOf.1.properties.template.properties.message:
         - Const failed
           Expected: {user} shared {resource} via link
           Received: {user} updated {field} for a link {token} on {resource}

                        "message": {
                          "const": "{user} updated {field} for a link {token} on {resource}"
                        },
                        "variables": {
                          "type": "object",
                          "required": ["field","folder","resource","token","user"],

FYI @SagarGi @individual-it

[kobergj]

Wouldn't WithVar not just overwrite WithResource? Maybe we should adjust WithResource to expect the resource name?

[2403905]

Do you mean like this?

// WithResource sets the resource variable for an activity
func WithResource(ref *provider.Reference, addSpace bool, explicitResourceName string) ActivityOption {
	return func(ctx context.Context, gwc gateway.GatewayAPIClient, vars map[string]interface{}) error {
		info, err := utils.GetResource(ctx, ref, gwc)
		if err != nil {
			if explicitResourceName == "" {
				explicitResourceName = filepath.Base(ref.GetPath())
			}
			vars["resource"] = Resource{
				Name: explicitResourceName,
			}
			n := getFolderName(ctx, gwc, ref)
			vars["folder"] = Resource{
				Name: n,
			}
			return err
		}

		if explicitResourceName == "" {
			explicitResourceName = info.GetName()
		}
		vars["resource"] = Resource{
			ID:   storagespace.FormatResourceID(info.GetId()),
			Name: explicitResourceName,
		}

		if addSpace {
			vars["space"] = Resource{
				ID:   info.GetSpace().GetId().GetOpaqueId(),
				Name: info.GetSpace().GetName(),
			}
		}

		parent, err := utils.GetResourceByID(ctx, info.GetParentId(), gwc)
		if err != nil {
			return err
		}
		vars["folder"] = Resource{
			ID:   info.GetParentId().GetOpaqueId(),
			Name: parent.GetName(),
		}

		return nil
	}
}

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud