RFC: Use AclName for consistency

thomasjpfan · thomasjpfan · commit 1320143e4838 · 2018-06-14T10:07:06.000-04:00
diff --git a/proxy/template.go b/proxy/template.go
@@ -385,9 +385,9 @@ func FormatServiceForTemplates(sr *Service) {
 		}
 
 		if sd.SrcPort > 0 {
-			sr.ServiceDest[i].SrcPortAclName = fmt.Sprintf(" srcPort_%s%d_%d", sr.ServiceName, sd.SrcPort, sd.Index)
+			sr.ServiceDest[i].SrcPortAclName = fmt.Sprintf(" srcPort_%s%d_%d", sr.AclName, sd.SrcPort, sd.Index)
 			sr.ServiceDest[i].SrcPortAcl = fmt.Sprintf("\n    acl srcPort_%s%d_%d dst_port %d",
-				sr.ServiceName, sd.SrcPort, sd.Index, sd.SrcPort)
+				sr.AclName, sd.SrcPort, sd.Index, sd.SrcPort)
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -385,9 +385,9 @@ func FormatServiceForTemplates(sr *Service) {`
`385`	`385`	`}`
`386`	`386`
`387`	`387`	`if sd.SrcPort > 0 {`
`388`		`- sr.ServiceDest[i].SrcPortAclName = fmt.Sprintf(" srcPort_%s%d_%d", sr.ServiceName, sd.SrcPort, sd.Index)`
	`388`	`+ sr.ServiceDest[i].SrcPortAclName = fmt.Sprintf(" srcPort_%s%d_%d", sr.AclName, sd.SrcPort, sd.Index)`
`389`	`389`	`sr.ServiceDest[i].SrcPortAcl = fmt.Sprintf("\n acl srcPort_%s%d_%d dst_port %d",`
`390`		`- sr.ServiceName, sd.SrcPort, sd.Index, sd.SrcPort)`
	`390`	`+ sr.AclName, sd.SrcPort, sd.Index, sd.SrcPort)`
`391`	`391`	`}`
`392`	`392`	`}`
`393`	`393`	`}`