More linting

Author: DiamondJoseph

policy/diamond/policy/session/session_test.rego

@@ -183,8 +183,21 @@ test_session_beamline if {
 }
 
 test_user_session_tags if {
-	session.user_sessions == set() with data.diamond.data as diamond_data with data.diamond.policy.token.claims as {"fedid": "oscar"}
-	session.user_sessions == {{"proposal_number": 1, "visit_number": 2, "beamline": "b07"}, {"proposal_number": 1, "visit_number": 1, "beamline": "i03"}} with data.diamond.data as diamond_data with data.diamond.policy.token.claims as {"fedid": "alice"}
-	session.user_sessions == {{"proposal_number": 1, "visit_number": 2, "beamline": "b07"}, {"proposal_number": 1, "visit_number": 1, "beamline": "i03"}} with data.diamond.data as diamond_data with data.diamond.policy.token.claims as {"fedid": "bob"}
-	session.user_sessions == {{"proposal_number": 1, "visit_number": 2, "beamline": "b07"}, {"proposal_number": 1, "visit_number": 1, "beamline": "i03"}} with data.diamond.data as diamond_data with data.diamond.policy.token.claims as {"fedid": "carol"}
+	session.user_sessions == set() with data.diamond.data as diamond_data
+		with data.diamond.policy.token.claims as {"fedid": "oscar"}
+	session.user_sessions == {
+		{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
+		{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
+	} with data.diamond.data as diamond_data
+		with data.diamond.policy.token.claims as {"fedid": "alice"}
+	session.user_sessions == {
+		{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
+		{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
+	} with data.diamond.data as diamond_data
+		with data.diamond.policy.token.claims as {"fedid": "bob"}
+	session.user_sessions == {
+		{"proposal_number": 1, "visit_number": 2, "beamline": "b07"},
+		{"proposal_number": 1, "visit_number": 1, "beamline": "i03"},
+	} with data.diamond.data as diamond_data
+		with data.diamond.policy.token.claims as {"fedid": "carol"}
 }

policy/diamond/policy/tiled/tiled.rego

@@ -14,8 +14,6 @@ write_scopes := {
 	"register",
 }
 
-default scopes := set()
-
 scopes_for(claims) := read_scopes & write_scopes if {
 	"azp" in object.keys(claims)
 	endswith(claims.azp, "-blueapi")
@@ -30,4 +28,6 @@ scopes_for(claims) := read_scopes if {
 	not "azp" in object.keys(claims)
 }
 
+default scopes := set()
+
 scopes := scopes_for(token.claims)