veyron/services/wsprd: Fix broken tests.
Change-Id: Iebb34a04380022451fdb4131b7a9338c6b199ef9
diff --git a/services/wsprd/app/app.go b/services/wsprd/app/app.go
index f70647d..ed0ee88 100644
--- a/services/wsprd/app/app.go
+++ b/services/wsprd/app/app.go
@@ -60,7 +60,7 @@
type jsonServiceCaveat struct {
Type string `json:"_type"`
- Service security.PrincipalPattern
+ Service security.BlessingPattern
Data json.RawMessage
}
diff --git a/services/wsprd/app/app_test.go b/services/wsprd/app/app_test.go
index 0368530..f0e654d 100644
--- a/services/wsprd/app/app_test.go
+++ b/services/wsprd/app/app_test.go
@@ -690,16 +690,16 @@
expectedValue security.ServiceCaveat
}{
{
- json: `{"_type":"MethodCaveat","service":"*","data":["Get","MultiGet"]}`,
+ json: `{"_type":"MethodCaveat","service":"...","data":["Get","MultiGet"]}`,
expectedValue: security.ServiceCaveat{
- Service: "*",
+ Service: security.AllPrincipals,
Caveat: &caveat.MethodRestriction{"Get", "MultiGet"},
},
},
{
- json: `{"_type":"PeerIdentityCaveat","service":"*","data":["veyron/batman","veyron/brucewayne"]}`,
+ json: `{"_type":"PeerIdentityCaveat","service":"...","data":["veyron/batman","veyron/brucewayne"]}`,
expectedValue: security.ServiceCaveat{
- Service: "*",
+ Service: security.AllPrincipals,
Caveat: &caveat.PeerIdentity{"veyron/batman", "veyron/brucewayne"},
},
},
@@ -863,7 +863,7 @@
"caveats": []map[string]interface{}{
map[string]interface{}{
"_type": "MethodCaveat",
- "service": "*",
+ "service": security.AllPrincipals,
"data": []string{"Foo"},
},
},
@@ -886,7 +886,7 @@
"caveats": []map[string]interface{}{
map[string]interface{}{
"_type": "PeerIdentityCaveat",
- "service": "*",
+ "service": security.AllPrincipals,
"data": []string{securityName("test/alice")},
},
},
@@ -909,12 +909,12 @@
"caveats": []map[string]interface{}{
map[string]interface{}{
"_type": "PeerIdentityCaveat",
- "service": "*",
+ "service": security.AllPrincipals,
"data": []string{securityName("test/alice")},
},
map[string]interface{}{
"_type": "MethodCaveat",
- "service": "*",
+ "service": security.AllPrincipals,
"data": []string{"Bar"},
},
},
