feat(policy): add optional name field to registered KASes in policy (#1641)

Resolves #153

Author: jakedoublev

service/integration/attribute_fqns_test.go

@@ -242,6 +242,7 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Definition
 
 	// create a second kas registration and grant it to the attribute definition
 	cachedKeyPem := "cached_key"
+	cachedKASName := "test_kas_name"
 	cachedKas, err := s.db.PolicyClient.CreateKeyAccessServer(s.ctx, &kasregistry.CreateKeyAccessServerRequest{
 		Uri: "https://example.org/kas2",
 		PublicKey: &policy.PublicKey{
@@ -255,6 +256,7 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Definition
 				},
 			},
 		},
+		Name: cachedKASName,
 	})
 	s.Require().NoError(err)
 	s.NotNil(cachedKas)
@@ -283,6 +285,7 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Definition
 	for _, g := range got.GetGrants() {
 		if g.GetId() == cachedKasID {
 			s.Equal(g.GetPublicKey().GetCached().GetKeys()[0].GetPem(), cachedKeyPem)
+			s.Equal(g.GetName(), cachedKASName)
 			pemIsPresent = true
 		}
 	}
@@ -350,13 +353,15 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Values() {
 	s.Empty(got.GetValues()[0].GetGrants())
 
 	// create a new kas registration
+	remoteKASName := "testing-io-remote"
 	remoteKAS, err := s.db.PolicyClient.CreateKeyAccessServer(s.ctx, &kasregistry.CreateKeyAccessServerRequest{
 		Uri: "https://testing.io/kas",
 		PublicKey: &policy.PublicKey{
 			PublicKey: &policy.PublicKey_Remote{
 				Remote: "https://testing.org/kas",
 			},
 		},
+		Name: remoteKASName,
 	})
 	s.Require().NoError(err)
 	s.NotNil(remoteKAS)
@@ -370,7 +375,8 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Values() {
 	s.NotNil(grant)
 
 	// create a second kas registration and grant it to the second value
-	localKAS, err := s.db.PolicyClient.CreateKeyAccessServer(s.ctx, &kasregistry.CreateKeyAccessServerRequest{
+	cachedKASName := "testion-io-local"
+	cachedKAS, err := s.db.PolicyClient.CreateKeyAccessServer(s.ctx, &kasregistry.CreateKeyAccessServerRequest{
 		Uri: "https://testing.io/kas2",
 		PublicKey: &policy.PublicKey{
 			PublicKey: &policy.PublicKey_Cached{
@@ -383,12 +389,13 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Values() {
 				},
 			},
 		},
+		Name: cachedKASName,
 	})
 	s.Require().NoError(err)
-	s.NotNil(localKAS)
+	s.NotNil(cachedKAS)
 
 	grant2, err := s.db.PolicyClient.AssignKeyAccessServerToValue(s.ctx, &attributes.ValueKeyAccessServer{
-		KeyAccessServerId: localKAS.GetId(),
+		KeyAccessServerId: cachedKAS.GetId(),
 		ValueId:           valueSecond.GetId(),
 	})
 	s.Require().NoError(err)
@@ -410,13 +417,16 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_Values() {
 	s.Empty(got.GetGrants())
 
 	for _, v := range got.GetValues() {
+		grants := v.GetGrants()
+		s.Require().Len(grants, 1)
+		firstGrant := grants[0]
 		switch v.GetId() {
 		case valueFirst.GetId():
-			s.Require().Len(v.GetGrants(), 1)
-			s.Equal(remoteKAS.GetId(), v.GetGrants()[0].GetId())
+			s.Equal(remoteKAS.GetId(), firstGrant.GetId())
+			s.Equal(remoteKASName, firstGrant.GetName())
 		case valueSecond.GetId():
-			s.Require().Len(v.GetGrants(), 1)
-			s.Equal(localKAS.GetId(), v.GetGrants()[0].GetId())
+			s.Equal(cachedKAS.GetId(), firstGrant.GetId())
+			s.Equal(cachedKASName, firstGrant.GetName())
 		default:
 			s.Fail("unexpected value", v)
 		}
@@ -584,13 +594,15 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_NamespaceG
 	s.NotNil(attr)
 
 	// create a new kas registration
+	nsKASName := "namespace-kas1"
 	kas, err := s.db.PolicyClient.CreateKeyAccessServer(s.ctx, &kasregistry.CreateKeyAccessServerRequest{
 		Uri: "https://testing_granted_namespace.com/kas",
 		PublicKey: &policy.PublicKey{
 			PublicKey: &policy.PublicKey_Remote{
 				Remote: "https://testing_granted_namespace.com/kas",
 			},
 		},
+		Name: nsKASName,
 	})
 	s.Require().NoError(err)
 	s.NotNil(kas)
@@ -610,8 +622,10 @@ func (s *AttributeFqnSuite) TestGetAttributeByFqn_WithKeyAccessGrants_NamespaceG
 
 	// ensure the namespace has the grants
 	gotNs := got.GetNamespace()
-	s.Len(gotNs.GetGrants(), 1)
-	s.Equal(kas.GetId(), gotNs.GetGrants()[0].GetId())
+	grants := gotNs.GetGrants()
+	s.Len(grants, 1)
+	s.Equal(kas.GetId(), grants[0].GetId())
+	s.Equal(nsKASName, grants[0].GetName())
 }
 
 // for all the big tests set up:

service/integration/attribute_values_test.go

@@ -108,7 +108,8 @@ func (s *AttributeValuesSuite) Test_GetAttributeValue_ContainsKASGrants() {
 	s.NotNil(got)
 	s.Empty(got.GetGrants())
 
-	fixtureKeyAccessServerID = s.f.GetKasRegistryKey("key_access_server_1").ID
+	fixtureKeyAccessServer := s.f.GetKasRegistryKey("key_access_server_1")
+	fixtureKeyAccessServerID := fixtureKeyAccessServer.ID
 	assignment := &attributes.ValueKeyAccessServer{
 		ValueId:           createdValue.GetId(),
 		KeyAccessServerId: fixtureKeyAccessServerID,
@@ -122,8 +123,10 @@ func (s *AttributeValuesSuite) Test_GetAttributeValue_ContainsKASGrants() {
 	s.Require().NoError(err)
 	s.NotNil(got)
 	s.Equal(createdValue.GetId(), got.GetId())
-	s.Len(got.GetGrants(), 1)
-	s.Equal(fixtureKeyAccessServerID, got.GetGrants()[0].GetId())
+	gotGrants := got.GetGrants()
+	s.Len(gotGrants, 1)
+	s.Equal(fixtureKeyAccessServerID, gotGrants[0].GetId())
+	s.Equal(fixtureKeyAccessServer.Name, gotGrants[0].GetName())
 }
 
 func (s *AttributeValuesSuite) Test_CreateAttributeValue_SetsActiveStateTrueByDefault() {

service/integration/attributes_test.go

@@ -342,6 +342,7 @@ func (s *AttributesSuite) Test_GetAttribute_ContainsKASGrants() {
 				Remote: "https://example.com/kas/key/1",
 			},
 		},
+		Name: "def_kas-name",
 	}
 	createdKAS, err := s.db.PolicyClient.CreateKeyAccessServer(s.ctx, kas)
 	s.Require().NoError(err)
@@ -362,8 +363,10 @@ func (s *AttributesSuite) Test_GetAttribute_ContainsKASGrants() {
 	s.Require().NoError(err)
 	s.NotNil(gotAttr)
 
-	s.Len(gotAttr.GetGrants(), 1)
-	s.Equal(createdKAS.GetId(), gotAttr.GetGrants()[0].GetId())
+	gotGrants := gotAttr.GetGrants()
+	s.Len(gotGrants, 1)
+	s.Equal(createdKAS.GetId(), gotGrants[0].GetId())
+	s.Equal(kas.GetName(), gotGrants[0].GetName())
 }
 
 func (s *AttributesSuite) Test_ListAttributes() {