t3c: strategies.yaml hash_key only for consistent_hash

CHANGELOG.md

@@ -56,8 +56,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 - [#7137](https://github.com/apache/trafficcontrol/pull/7137) *Traffic Control Cache Config (t3c)* parent.config simulate topology for non topo delivery services.
 - [#7153](https://github.com/apache/trafficcontrol/pull/7153) *Traffic Control Cache Config (t3c)* Adds an extra T3C check for validity of an ssl cert (crash fix).
 - [#3965](https://github.com/apache/trafficcontrol/pull/3965) *Traffic Router* Traffic Router now always includes a `Content-Length` header in the response.
-- [#7182](https://github.com/apache/trafficcontrol/pull/7182) Sort peers used in strategy.yaml to prevent false positive for reload.
 - [#6533](https://github.com/apache/trafficcontrol/issues/6533) *TR should not rename/recreate log files on rollover
+- [#7182](https://github.com/apache/trafficcontrol/pull/7182) *Traffic Control Cache Config (t3c)* Sort peers used in strategy.yaml to prevent false positive for reload.
+- [#7204](https://github.com/apache/trafficcontrol/pull/7204) *Traffic Control Cache Config (t3c)* strategies.yaml hash_key only for consistent_hash
 
 ## [7.0.0] - 2022-07-19
 ### Added

lib/go-atscfg/strategiesdotconfig.go

@@ -200,10 +200,12 @@ func getStrategyStrategiesSection(pa *ParentAbstraction) string {
 	for _, svc := range pa.Services {
 		txt += "\n" + `  - strategy: '` + getStrategyName(svc.Name) + `'`
 		txt += "\n" + `    policy: ` + getStrategyPolicy(svc.RetryPolicy)
-		if !svc.IgnoreQueryStringInParentSelection {
-			txt += "\n" + `    hash_key: path+query`
-		} else {
-			txt += "\n" + `    hash_key: path`
+		if svc.RetryPolicy == ParentAbstractionServiceRetryPolicyConsistentHash {
+			if !svc.IgnoreQueryStringInParentSelection {
+				txt += "\n" + `    hash_key: path+query`
+			} else {
+				txt += "\n" + `    hash_key: path`
+			}
 		}
 		txt += "\n" + `    go_direct: ` + strconv.FormatBool(svc.GoDirect)
 		if getStrategySecondaryMode(svc.SecondaryMode) == "peering_ring" {

lib/go-atscfg/strategiesdotconfig_test.go

@@ -1485,6 +1485,15 @@ func TestMakeStrategiesDotYAMLFirstLastNoTopoParams(t *testing.T) {
 		if 0 < len(missing) {
 			t.Errorf("Missing required string(s) from ds/line: %s/%v\n%v", *ds.XMLID, missing, txt)
 		}
+
+		excludes := []string{
+			`hash_key`,
+		}
+
+		excluding := missingFrom(txt, excludes)
+		if 1 != len(excludes) {
+			t.Errorf("Excluded required string(s) from ds/line: %s/%v\n%v", *ds.XMLID, excluding, txt)
+		}
 	}
 }
 
@@ -1783,6 +1792,7 @@ func TestMakeStrategiesDotYAMLFirstInnerLastParams(t *testing.T) {
 
 		needs := []string{
 			` policy: consistent_hash`,
+			` hash_key: path`,
 			` go_direct: false`,
 			` max_simple_retries: 12`,
 			` max_unavailable_retries: 22`,
@@ -1809,6 +1819,7 @@ func TestMakeStrategiesDotYAMLFirstInnerLastParams(t *testing.T) {
 
 		needs := []string{
 			` policy: consistent_hash`,
+			` hash_key: path`,
 			` go_direct: false`,
 			` max_simple_retries: 13`,
 			` max_unavailable_retries: 23`,
@@ -1846,5 +1857,14 @@ func TestMakeStrategiesDotYAMLFirstInnerLastParams(t *testing.T) {
 		if 0 < len(missing) {
 			t.Errorf("Missing required string(s) from line: %v\n%v", missing, txt)
 		}
+
+		excludes := []string{
+			`hash_key`,
+		}
+
+		excluding := missingFrom(txt, excludes)
+		if 1 != len(excludes) {
+			t.Errorf("Excluded required string(s) from ds/line: %s/%v\n%v", *ds.XMLID, excluding, txt)
+		}
 	}
 }