use common policy match func

Author: jsbroks

apps/workspace-engine/pkg/selector/policies.go

@@ -0,0 +1,54 @@
+package selector
+
+import (
+	"context"
+	"workspace-engine/pkg/oapi"
+)
+
+func NewBasicReleaseTarget(environment *oapi.Environment, deployment *oapi.Deployment, resource *oapi.Resource) *BasicReleaseTarget {
+	return &BasicReleaseTarget{
+		environment: environment,
+		deployment: deployment,
+		resource: resource,
+	}
+}
+
+type BasicReleaseTarget struct {
+	environment *oapi.Environment
+	deployment *oapi.Deployment
+	resource *oapi.Resource
+}
+
+func (b *BasicReleaseTarget) Environment() *oapi.Environment {
+	return b.environment
+}
+
+func (b *BasicReleaseTarget) Deployment() *oapi.Deployment {
+	return b.deployment
+}
+
+func (b *BasicReleaseTarget) Resource() *oapi.Resource {
+	return b.resource
+}
+
+func MatchPolicy(ctx context.Context, policy *oapi.Policy, releaseTarget *BasicReleaseTarget) bool {
+	for _, policyTarget := range policy.Selectors {
+		if policyTarget.EnvironmentSelector != nil {
+			if ok, _ := Match(ctx, policyTarget.EnvironmentSelector, releaseTarget.Environment()); !ok {
+				continue
+			}
+		}
+		if policyTarget.DeploymentSelector != nil {
+			if ok, _ := Match(ctx, policyTarget.DeploymentSelector, releaseTarget.Deployment()); !ok {
+				continue
+			}
+		}
+		if policyTarget.ResourceSelector != nil {
+			if ok, _ := Match(ctx, policyTarget.ResourceSelector, releaseTarget.Resource()); !ok {
+				continue
+			}
+		}
+		return true
+	}
+	return false
+}

apps/workspace-engine/pkg/server/openapi/policies/policies.go

@@ -3,13 +3,38 @@ package policies
 import (
 	"net/http"
 	"workspace-engine/pkg/oapi"
+	"workspace-engine/pkg/server/openapi/utils"
 
 	"github.com/gin-gonic/gin"
 )
 
 type Policies struct{}
 
 func (p *Policies) GetReleaseTargetsForPolicy(c *gin.Context, workspaceId oapi.WorkspaceId, policyId oapi.PolicyId) {
+	ws := utils.GetWorkspace(c, workspaceId)
+	if ws == nil {
+		c.JSON(http.StatusNotFound, gin.H{
+			"error": "Workspace not found",
+		})
+		return
+	}
+
+	// policy, ok := ws.Policies().Get(policyId)
+	// if !ok {
+	// 	c.JSON(http.StatusNotFound, gin.H{
+	// 		"error": "Policy not found",
+	// 	})
+	// 	return
+	// }
+
+	// releaseTargets, err := ws.ReleaseTargets().Items(c.Request.Context())
+	// if err != nil {
+	// 	c.JSON(http.StatusInternalServerError, gin.H{
+	// 		"error": "Failed to get release targets for policy: " + err.Error(),
+	// 	})
+	// 	return
+	// }
+
 	c.JSON(http.StatusInternalServerError, gin.H{
 		"error": "Not implemented",
 	})

apps/workspace-engine/pkg/workspace/store/release_targets.go

@@ -149,31 +149,12 @@ func (r *ReleaseTargets) computePolicies(ctx context.Context, releaseTarget *oap
 		return nil, fmt.Errorf("resource %s not found", releaseTarget.ResourceId)
 	}
 
+	resolvedReleaseTarget := selector.NewBasicReleaseTarget(environments, deployments, resources)
 	matchingPolicies := make(map[string]*oapi.Policy)
 
 	for policyItem := range r.store.Policies.IterBuffered() {
 		policy := policyItem.Val
-		hasMatch := false
-		for _, policyTarget := range policy.Selectors {
-			if policyTarget.EnvironmentSelector != nil {
-				if ok, _ := selector.Match(ctx, policyTarget.EnvironmentSelector, environments); !ok {
-					continue
-				}
-			}
-			if policyTarget.DeploymentSelector != nil {
-				if ok, _ := selector.Match(ctx, policyTarget.DeploymentSelector, deployments); !ok {
-					continue
-				}
-			}
-			if policyTarget.ResourceSelector != nil {
-				if ok, _ := selector.Match(ctx, policyTarget.ResourceSelector, resources); !ok {
-					continue
-				}
-			}
-			hasMatch = true
-			break
-		}
-		if hasMatch {
+		if selector.MatchPolicy(ctx, policy, resolvedReleaseTarget) {
 			matchingPolicies[policy.Id] = policy
 		}
 	}