Implemented requests from reviews.

- Corrected grammar in doc.go.
- Obfuscating parse failures with a permissions error. These errors should primarily be checked on the client.
- Updated unit tests to conform to new param structure.

Author: kat-co

api/leadership/client_test.go

@@ -63,8 +63,8 @@ func (s *clientSuite) TestClaimLeadershipTranslation(c *gc.C) {
 			}}
 
 			c.Assert(typedP.Params, gc.HasLen, 1)
-			c.Check(typedP.Params[0].ServiceTag.Id(), gc.Equals, StubServiceNm)
-			c.Check(typedP.Params[0].UnitTag.Id(), gc.Equals, StubUnitNm)
+			c.Check(typedP.Params[0].ServiceTag, gc.Equals, names.NewServiceTag(StubServiceNm).String())
+			c.Check(typedP.Params[0].UnitTag, gc.Equals, names.NewUnitTag(StubUnitNm).String())
 
 			return nil
 		},
@@ -130,8 +130,8 @@ func (s *clientSuite) TestReleaseLeadershipTranslation(c *gc.C) {
 			typedR.Results = []params.ErrorResult{{}}
 
 			c.Assert(typedP.Params, gc.HasLen, 1)
-			c.Check(typedP.Params[0].ServiceTag.Id(), gc.Equals, StubServiceNm)
-			c.Check(typedP.Params[0].UnitTag.Id(), gc.Equals, StubUnitNm)
+			c.Check(typedP.Params[0].ServiceTag, gc.Equals, names.NewServiceTag(StubServiceNm).String())
+			c.Check(typedP.Params[0].UnitTag, gc.Equals, names.NewUnitTag(StubUnitNm).String())
 
 			return nil
 		},

apiserver/leadership/leadership.go

@@ -173,17 +173,22 @@ func callWithIds(fn func(string, string) error) func(st, ut names.Tag) params.Er
 	}
 }
 
+// parseServiceAndUnitTags takes in string representations of service
+// and unit tags and parses them into structs.
+//
+// NOTE: we return permissions errors when parsing fails to obfuscate
+// the parse-failure. This is for security purposes.
 func parseServiceAndUnitTags(
 	serviceTagString, unitTagString string,
 ) (serviceTag names.ServiceTag, unitTag names.UnitTag, _ *params.Error) {
 	serviceTag, err := names.ParseServiceTag(serviceTagString)
 	if err != nil {
-		return serviceTag, unitTag, common.ServerError(err)
+		return serviceTag, unitTag, common.ServerError(common.ErrPerm)
 	}
 
 	unitTag, err = names.ParseUnitTag(unitTagString)
 	if err != nil {
-		return serviceTag, unitTag, common.ServerError(err)
+		return serviceTag, unitTag, common.ServerError(common.ErrPerm)
 	}
 
 	return serviceTag, unitTag, nil

apiserver/leadership/leadership_test.go

@@ -96,8 +96,8 @@ func (s *leadershipSuite) TestClaimLeadershipTranslation(c *gc.C) {
 	results, err := ldrSvc.ClaimLeadership(params.ClaimLeadershipBulkParams{
 		Params: []params.ClaimLeadershipParams{
 			params.ClaimLeadershipParams{
-				ServiceTag: names.NewServiceTag(StubServiceNm),
-				UnitTag:    names.NewUnitTag(StubUnitNm),
+				ServiceTag: names.NewServiceTag(StubServiceNm).String(),
+				UnitTag:    names.NewUnitTag(StubUnitNm).String(),
 			},
 		},
 	})
@@ -119,8 +119,8 @@ func (s *leadershipSuite) TestReleaseLeadershipTranslation(c *gc.C) {
 	results, err := ldrSvc.ClaimLeadership(params.ClaimLeadershipBulkParams{
 		Params: []params.ClaimLeadershipParams{
 			params.ClaimLeadershipParams{
-				ServiceTag: names.NewServiceTag(StubServiceNm),
-				UnitTag:    names.NewUnitTag(StubUnitNm),
+				ServiceTag: names.NewServiceTag(StubServiceNm).String(),
+				UnitTag:    names.NewUnitTag(StubUnitNm).String(),
 			},
 		},
 	})
@@ -153,8 +153,8 @@ func (s *leadershipSuite) TestClaimLeadershipFailOnAuthorizerErrors(c *gc.C) {
 	results, err := ldrSvc.ClaimLeadership(params.ClaimLeadershipBulkParams{
 		Params: []params.ClaimLeadershipParams{
 			params.ClaimLeadershipParams{
-				ServiceTag: names.NewServiceTag(StubServiceNm),
-				UnitTag:    names.NewUnitTag(StubUnitNm),
+				ServiceTag: names.NewServiceTag(StubServiceNm).String(),
+				UnitTag:    names.NewUnitTag(StubUnitNm).String(),
 			},
 		},
 	})
@@ -174,8 +174,8 @@ func (s *leadershipSuite) TestReleaseLeadershipFailOnAuthorizerErrors(c *gc.C) {
 	results, err := ldrSvc.ClaimLeadership(params.ClaimLeadershipBulkParams{
 		Params: []params.ClaimLeadershipParams{
 			params.ClaimLeadershipParams{
-				ServiceTag: names.NewServiceTag(StubServiceNm),
-				UnitTag:    names.NewUnitTag(StubUnitNm),
+				ServiceTag: names.NewServiceTag(StubServiceNm).String(),
+				UnitTag:    names.NewUnitTag(StubUnitNm).String(),
 			},
 		},
 	})

featuretests/doc.go

@@ -8,7 +8,7 @@ tested.
 
 Rules:
 
-1) Do NOT mirror the architecture/namespaces of Juju. This shouldbe a
+1) Do NOT mirror the architecture/namespaces of Juju. This should be a
 very flat folder.
 
 2) Whenever possible, do not mock anything. The goal is to test the