remove helper methods from policy data types

acp/source_hub_client.go

@@ -162,17 +162,17 @@ func (a *sourceHubBridge) ValidateResourceExistsOnValidDPI(
 	policy := maybePolicy.Value()
 
 	// So far we validated that the policy exists, now lets validate that resource exists.
-	resourceResponse := policy.GetResourceByName(resourceName)
-	if resourceResponse == nil {
+	resourceResponse, ok := policy.Resources[resourceName]
+	if !ok {
 		return newErrResourceDoesNotExistOnTargetPolicy(resourceName, policyID)
 	}
 
 	// Now that we have validated that policyID exists and it contains a corresponding
 	// resource with the matching name, validate that all required permissions
 	// for DPI actually exist on the target resource.
 	for _, requiredPermission := range dpiRequiredPermissions {
-		permissionResponse := resourceResponse.GetPermissionByName(requiredPermission)
-		if permissionResponse == nil {
+		permissionResponse, ok := resourceResponse.Permissions[requiredPermission]
+		if !ok {
 			return newErrResourceIsMissingRequiredPermission(
 				resourceName,
 				requiredPermission,

acp/types.go

@@ -30,23 +30,13 @@ type policy struct {
 	Resources map[string]*resource
 }
 
-// GetResourceByName returns a Resource with the given name or nil
-func (p *policy) GetResourceByName(name string) *resource {
-	return p.Resources[name]
-}
-
 // resource is a data container carrying the necessary data
 // to verify whether it meets DPI requirements.
 type resource struct {
 	Name        string
 	Permissions map[string]*permission
 }
 
-// GetPermissionByName returns a permission with the given name or nil
-func (r *resource) GetPermissionByName(name string) *permission {
-	return r.Permissions[name]
-}
-
 // permission is a data container carrying the necessary data
 // to verify whether it meets DPI requirements.
 type permission struct {