fix: ACLPolicy check for hnsv2 (#815)

ashvindeodhar · web-flow · commit 9a352f261e3c · 2021-03-08T11:56:36.000-08:00
Current code is incorrectly checking against EndpointPolicyType.
diff --git a/network/policy/policy_windows.go b/network/policy/policy_windows.go
@@ -215,8 +215,11 @@ func GetPolicyType(policy Policy) CNIPolicyType {
 	}
 
 	// Check if the type is ACLPolicy
-	if policy.Type == ACLPolicy {
-		return ACLPolicy
+	var aclPolicy hcn.AclPolicySetting
+	if err := json.Unmarshal(policy.Data, &aclPolicy); err == nil {
+		if aclPolicy.Action != "" {
+			return ACLPolicy
+		}
 	}
 
 	// Return empty string if the policy type is invalid

Original file line number	Diff line number	Diff line change
`@@ -215,8 +215,11 @@ func GetPolicyType(policy Policy) CNIPolicyType {`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`// Check if the type is ACLPolicy`
`218`		`- if policy.Type == ACLPolicy {`
`219`		`- return ACLPolicy`
	`218`	`+ var aclPolicy hcn.AclPolicySetting`
	`219`	`+ if err := json.Unmarshal(policy.Data, &aclPolicy); err == nil {`
	`220`	`+ if aclPolicy.Action != "" {`
	`221`	`+ return ACLPolicy`
	`222`	`+ }`
`220`	`223`	`}`
`221`	`224`
`222`	`225`	`// Return empty string if the policy type is invalid`