APIGOV-31452 - Send New Insights Event Formats

pkg/agent/cache/accessrequest.go

@@ -41,6 +41,9 @@ func (c *cacheManager) AddAccessRequest(ri *v1.ResourceInstance) {
 	instID = instRef.ID
 
 	instance, _ := c.GetAPIServiceInstanceByID(instID)
+	if instance == nil && ar.Spec.ApiServiceInstance != "" {
+		instance, _ = c.GetAPIServiceInstanceByName(ar.Spec.ApiServiceInstance)
+	}
 	apiID := ""
 	apiStage := ""
 	apiVersion := ""

pkg/agent/discoverycache.go

@@ -246,7 +246,14 @@ func (dc *discoveryCache) buildResourceFunc(filter management.WatchTopicSpecFilt
 		logger := dc.logger.WithField("kind", filter.Kind)
 		logger.Tracef("fetching %s and updating cache", filter.Kind)
 
-		resources, err := dc.client.GetAPIV1ResourceInstances(nil, ri.GetKindLink())
+		var queryParams map[string]string
+		if filter.Kind == management.AccessRequestGVK().Kind {
+			queryParams = map[string]string{"embed": "metadata.references"}
+		} else if filter.Kind == management.APIServiceGVK().Kind {
+			queryParams = map[string]string{"embed": "x-agent-details"}
+		}
+
+		resources, err := dc.client.GetAPIV1ResourceInstances(queryParams, ri.GetKindLink())
 		if err != nil {
 			return fmt.Errorf("failed to fetch resources of kind %s: %s", filter.Kind, err)
 		}

pkg/agent/discoverycache_test.go

@@ -18,7 +18,7 @@ import (
 
 const envName = "mockEnv"
 
-func TestDiscoveryCache_execute(t *testing.T) {
+func TestDiscoveryCacheExecute(t *testing.T) {
 	tests := []struct {
 		agentType       config.AgentType
 		name            string
@@ -128,6 +128,17 @@ func TestDiscoveryCache_execute(t *testing.T) {
 			} else {
 				assert.False(t, migration.called)
 			}
+
+			// AccessRequest fetch must include embed=metadata.references.
+			if tc.accessReqCount > 0 {
+				arParams := c.queryParams["accessrequests"]
+				assert.Equal(t, "metadata.references", arParams["embed"], "accessrequests must be fetched with embed=metadata.references")
+			}
+			// APIService fetch must include embed=x-agent-details so externalAPIID is populated in the cache.
+			if tc.svcCount > 0 {
+				svcParams := c.queryParams["apiservices"]
+				assert.Equal(t, "x-agent-details", svcParams["embed"], "apiservices must be fetched with embed=x-agent-details")
+			}
 		})
 	}
 
@@ -194,19 +205,30 @@ type mockRIClient struct {
 	accessReqs  []*apiv1.ResourceInstance
 	creds       []*apiv1.ResourceInstance
 	err         error
+	// queryParams records the query params passed per URL fragment (kind name)
+	queryParams map[string]map[string]string
 }
 
-func (m mockRIClient) GetAPIV1ResourceInstances(_ map[string]string, URL string) ([]*apiv1.ResourceInstance, error) {
+func (m *mockRIClient) GetAPIV1ResourceInstances(query map[string]string, URL string) ([]*apiv1.ResourceInstance, error) {
 	fmt.Println(URL)
-	if strings.Contains(URL, "apiservices") {
-		return m.svcs, m.err
-	} else if strings.Contains(URL, "managedapplications") {
-		return m.managedApps, m.err
-	} else if strings.Contains(URL, "managedapplicationprofiles") {
+	if m.queryParams == nil {
+		m.queryParams = make(map[string]map[string]string)
+	}
+	switch {
+	case strings.Contains(URL, "managedapplicationprofiles"):
+		m.queryParams["managedapplicationprofiles"] = query
 		return m.manAppProfs, m.err
-	} else if strings.Contains(URL, "accessrequests") {
+	case strings.Contains(URL, "managedapplications"):
+		m.queryParams["managedapplications"] = query
+		return m.managedApps, m.err
+	case strings.Contains(URL, "apiservices"):
+		m.queryParams["apiservices"] = query
+		return m.svcs, m.err
+	case strings.Contains(URL, "accessrequests"):
+		m.queryParams["accessrequests"] = query
 		return m.accessReqs, m.err
-	} else if strings.Contains(URL, "credentials") {
+	case strings.Contains(URL, "credentials"):
+		m.queryParams["credentials"] = query
 		return m.creds, m.err
 	}
 	return make([]*apiv1.ResourceInstance, 0), m.err

pkg/agent/handler/credential_test.go

@@ -10,8 +10,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/stretchr/testify/assert"
+
 	apiv1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1"
-	v1 "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/api/v1"
 	management "github.com/Axway/agent-sdk/pkg/apic/apiserver/models/management/v1alpha1"
 	defs "github.com/Axway/agent-sdk/pkg/apic/definitions"
 	prov "github.com/Axway/agent-sdk/pkg/apic/provisioning"
@@ -21,9 +22,10 @@ import (
 	"github.com/Axway/agent-sdk/pkg/util"
 	"github.com/Axway/agent-sdk/pkg/util/log"
 	"github.com/Axway/agent-sdk/pkg/watchmanager/proto"
-	"github.com/stretchr/testify/assert"
 )
 
+const algRSAOAEP = "RSA-OAEP"
+
 func TestCredentialHandler(t *testing.T) {
 	crdRI, _ := crd.AsInstance()
 
@@ -196,7 +198,7 @@ func TestCredentialHandler(t *testing.T) {
 	}
 }
 
-func TestCredentialHandler_deleting(t *testing.T) {
+func TestCredentialHandlerDeleting(t *testing.T) {
 	crdRI, _ := crd.AsInstance()
 
 	tests := []struct {
@@ -311,7 +313,7 @@ func TestCredentialHandler_deleting(t *testing.T) {
 	}
 }
 
-func TestCredentialHandler_update(t *testing.T) {
+func TestCredentialHandlerUpdate(t *testing.T) {
 	crdRI, _ := crd.AsInstance()
 
 	tests := []struct {
@@ -412,7 +414,7 @@ func TestCredentialHandler_update(t *testing.T) {
 	}
 }
 
-func TestCredentialHandler_wrong_kind(t *testing.T) {
+func TestCredentialHandlerWrongKind(t *testing.T) {
 	c := &mockClient{}
 	p := &mockCredProv{}
 	handler := NewCredentialHandler(p, c, nil)
@@ -425,7 +427,7 @@ func TestCredentialHandler_wrong_kind(t *testing.T) {
 	assert.Nil(t, err)
 }
 
-func Test_creds(t *testing.T) {
+func TestCreds(t *testing.T) {
 	c := provCreds{
 		managedApp: "app-name",
 		credType:   "api-key",
@@ -792,7 +794,7 @@ func decrypt(pk string, alg, hash string, data map[string]interface{}) map[strin
 	return data
 }
 
-func Test_encrypt(t *testing.T) {
+func TestEncrypt(t *testing.T) {
 	var crdSchema = `{
     "type": "object",
     "$schema": "http://json-schema.org/draft-07/schema#",
@@ -843,7 +845,7 @@ func Test_encrypt(t *testing.T) {
 		},
 		{
 			name:       "should encrypt when the algorithm is RSA-OAEP",
-			alg:        "RSA-OAEP",
+			alg:        algRSAOAEP,
 			hash:       "SHA256",
 			publicKey:  pub,
 			privateKey: priv,
@@ -859,15 +861,15 @@ func Test_encrypt(t *testing.T) {
 		{
 			name:       "should return an error when the hash is unknown",
 			hasErr:     true,
-			alg:        "RSA-OAEP",
+			alg:        algRSAOAEP,
 			hash:       "fake",
 			publicKey:  pub,
 			privateKey: priv,
 		},
 		{
 			name:       "should return an error when the public key cannot be parsed",
 			hasErr:     true,
-			alg:        "RSA-OAEP",
+			alg:        algRSAOAEP,
 			hash:       "SHA256",
 			publicKey:  "fake",
 			privateKey: priv,
@@ -946,7 +948,7 @@ func (m *credClient) UpdateResourceInstance(ri apiv1.Interface) (*apiv1.Resource
 	return nil, nil
 }
 
-func (m *credClient) DeleteResourceInstance(ri v1.Interface) error {
+func (m *credClient) DeleteResourceInstance(ri apiv1.Interface) error {
 	return nil
 }
 

pkg/agent/handler/traceaccessrequest.go

@@ -48,7 +48,11 @@ func (h *traceAccessRequestHandler) Handle(ctx context.Context, _ *proto.EventMe
 	if h.shouldProcessForTrace(ar.Status, ar.Metadata.State) {
 		cachedAccessReq := h.cache.GetAccessRequest(resource.Metadata.ID)
 		if cachedAccessReq == nil {
-			h.cache.AddAccessRequest(resource)
+			enriched, err := h.client.GetResource(resource.GetSelfLink() + "?embed=metadata.references")
+			if err != nil || enriched == nil {
+				enriched = resource
+			}
+			h.cache.AddAccessRequest(enriched)
 		}
 	}
 	return nil