Skip to content

Commit

Permalink
Rebase with main
Browse files Browse the repository at this point in the history 
Fix tests
  • Loading branch information
@ranatrk
ranatrk committed Nov 1, 2023
1 parent 7a23fd6 commit dbea5b3
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 53 deletions.
103 changes: 53 additions & 50 deletions core/server/inventory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (cs *coreServer) GetInventory(ctx context.Context, msg *pb.GetInventoryRequ
if err != nil {
return nil, err
}
entries, err = getFluxLikeInventory(ctx, client, msg.Name, msg.Namespace, *gvk)
inventoryRefs, err = getFluxLikeInventory(ctx, client, msg.Name, msg.Namespace, *gvk)
if err != nil {
return nil, fmt.Errorf("failed getting flux like inventory: %w", err)
}
Expand All @@ -74,14 +74,18 @@ func (cs *coreServer) GetInventory(ctx context.Context, msg *pb.GetInventoryRequ
return nil, fmt.Errorf("failed getting objects with children: %w", err)
}

entries := []*pb.InventoryEntry{}
clusterUserNamespaces := cs.clustersManager.GetUserNamespaces(auth.Principal(ctx))
entries, err := unstructuredToInventoryEntry(msg.ClusterName, objsWithChildren, clusterUserNamespaces, cs.healthChecker)
if err != nil {
return nil, fmt.Errorf("failed converting inventory entry: %w", err)
for _, oc := range objsWithChildren {
entry, err := unstructuredToInventoryEntry(msg.ClusterName, *oc, clusterUserNamespaces, cs.healthChecker)
if err != nil {
return nil, fmt.Errorf("failed converting inventory entry: %w", err)
}
entries = append(entries, entry)
}

return &pb.GetInventoryResponse{
Entries: resources,
Entries: entries,
}, nil
}

Expand Down Expand Up @@ -112,7 +116,7 @@ func (cs *coreServer) getKustomizationInventory(ctx context.Context, k8sClient c
cs.logger.Error(err, "failed converting inventory entry", "entry", ref)
return nil, err
}
objects = append(objects, obj)
objects = append(objects, &obj)
}

return objects, nil
Expand Down Expand Up @@ -213,49 +217,48 @@ func getHelmReleaseObjects(ctx context.Context, k8sClient client.Client, helmRel
return objects, nil
}

func unstructuredToInventoryEntry(clusterName string, objWithChildren []*ObjectWithChildren, clusterUserNamespaces map[string][]v1.Namespace, healthChecker health.HealthChecker) ([]*pb.InventoryEntry, error) {
entries := []*pb.InventoryEntry{}
for _, c := range objWithChildren {
unstructuredObj := *c.Object
if unstructuredObj.GetKind() == "Secret" {
sanitizedUnstructuredObj, err := SanitizeUnstructuredSecret(unstructuredObj)
unstructuredObj = *sanitizedUnstructuredObj
if err != nil {
return nil, fmt.Errorf("error sanitizing secrets: %w", err)
}
}
bytes, err := unstructuredObj.MarshalJSON()
func unstructuredToInventoryEntry(clusterName string, objWithChildren ObjectWithChildren, clusterUserNamespaces map[string][]v1.Namespace, healthChecker health.HealthChecker) (*pb.InventoryEntry, error) {
unstructuredObj := *objWithChildren.Object
if unstructuredObj.GetKind() == "Secret" {
var err error
unstructuredObj, err = SanitizeUnstructuredSecret(unstructuredObj)
if err != nil {
return nil, fmt.Errorf("failed to marshal unstructured object: %w", err)
return nil, fmt.Errorf("error sanitizing secrets: %w", err)
}
}
bytes, err := unstructuredObj.MarshalJSON()
if err != nil {
return nil, fmt.Errorf("failed to marshal unstructured object: %w", err)
}

tenant := GetTenant(unstructuredObj.GetNamespace(), clusterName, clusterUserNamespaces)
tenant := GetTenant(unstructuredObj.GetNamespace(), clusterName, clusterUserNamespaces)

health, err := healthChecker.Check(unstructuredObj)
if err != nil {
return nil, fmt.Errorf("failed to check health: %w", err)
}
health, err := healthChecker.Check(unstructuredObj)
if err != nil {
return nil, fmt.Errorf("failed to check health: %w", err)
}

children, err := unstructuredToInventoryEntry(clusterName, c.Children, clusterUserNamespaces, healthChecker)
children := []*pb.InventoryEntry{}
for _, c := range objWithChildren.Children {
child, err := unstructuredToInventoryEntry(clusterName, *c, clusterUserNamespaces, healthChecker)
if err != nil {
return nil, fmt.Errorf("failed converting child inventory entry: %w", err)
}
children = append(children, child)
}

entry := &pb.InventoryEntry{
Payload: string(bytes),
Tenant: tenant,
ClusterName: clusterName,
Children: children,
Health: &pb.HealthStatus{
Status: string(health.Status),
Message: health.Message,
},
}

entries = append(entries, entry)
entry := &pb.InventoryEntry{
Payload: string(bytes),
Tenant: tenant,
ClusterName: clusterName,
Children: children,
Health: &pb.HealthStatus{
Status: string(health.Status),
Message: health.Message,
},
}

return entries, nil
return entry, nil
}

// GetObjectsWithChildren returns objects with their children populated if withChildren is true.
Expand All @@ -281,7 +284,7 @@ func GetObjectsWithChildren(ctx context.Context, objects []*unstructured.Unstruc
children := []*ObjectWithChildren{}
if withChildren {
var err error
children, err = getChildren(ctx, k8sClient, obj)
children, err = GetChildren(ctx, k8sClient, obj)
if err != nil {
logger.Error(err, "failed getting children", "entry", obj)
return
Expand All @@ -304,7 +307,7 @@ func GetObjectsWithChildren(ctx context.Context, objects []*unstructured.Unstruc
return result, nil
}

func getChildren(ctx context.Context, k8sClient client.Client, parentObj unstructured.Unstructured) ([]*ObjectWithChildren, error) {
func GetChildren(ctx context.Context, k8sClient client.Client, parentObj unstructured.Unstructured) ([]*ObjectWithChildren, error) {
listResult := unstructured.UnstructuredList{}

switch parentObj.GetObjectKind().GroupVersionKind().Kind {
Expand Down Expand Up @@ -348,7 +351,7 @@ func getChildren(ctx context.Context, k8sClient client.Client, parentObj unstruc

for _, c := range unstructuredChildren {
var err error
children, err = getChildren(ctx, k8sClient, c)
children, err = GetChildren(ctx, k8sClient, c)
if err != nil {
return nil, err
}
Expand All @@ -364,12 +367,12 @@ func getChildren(ctx context.Context, k8sClient client.Client, parentObj unstruc
}

// ResourceRefToUnstructured converts a flux like resource entry pair of (id, version) into a unstructured object
func ResourceRefToUnstructured(id, version string) (*unstructured.Unstructured, error) {
u := &unstructured.Unstructured{}
func ResourceRefToUnstructured(id, version string) (unstructured.Unstructured, error) {
u := unstructured.Unstructured{}

objMetadata, err := object.ParseObjMetadata(id)
if err != nil {
return nil, fmt.Errorf("unable to parse inventory entry id: %w", err)
return u, err
}

u.SetGroupVersionKind(schema.GroupVersionKind{
Expand All @@ -384,20 +387,20 @@ func ResourceRefToUnstructured(id, version string) (*unstructured.Unstructured,
}

// SanitizeUnstructuredSecret redacts the data field of a Secret object
func SanitizeUnstructuredSecret(obj unstructured.Unstructured) (*unstructured.Unstructured, error) {
redactedUnstructured := &unstructured.Unstructured{}
func SanitizeUnstructuredSecret(obj unstructured.Unstructured) (unstructured.Unstructured, error) {
redactedUnstructured := unstructured.Unstructured{}
s := &v1.Secret{}

err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.UnstructuredContent(), s)
if err != nil {
return nil, fmt.Errorf("converting unstructured to secret: %w", err)
return redactedUnstructured, fmt.Errorf("converting unstructured to helmrelease: %w", err)
}

s.Data = map[string][]byte{"redacted": []byte(nil)}

redactedObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(s)
if err != nil {
return nil, fmt.Errorf("converting unstructured to secret: %w", err)
return redactedUnstructured, fmt.Errorf("converting unstructured to helmrelease: %w", err)
}

redactedUnstructured.SetUnstructuredContent(redactedObj)
Expand Down Expand Up @@ -439,8 +442,8 @@ func parseInventoryFromUnstructured(obj *unstructured.Unstructured) ([]*unstruct
}

objects := []*unstructured.Unstructured{}
for _, entry := range resourceInventory.Entries {
u, err := resourceRefToUnstructured(entry)
for _, ref := range resourceInventory.Entries {
u, err := ResourceRefToUnstructured(ref.ID, ref.Version)
if err != nil {
return nil, fmt.Errorf("error converting resource ref to unstructured: %w", err)
}
Expand Down
6 changes: 3 additions & 3 deletions core/server/inventory_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ func TestResourceRefToUnstructured(t *testing.T) {
name: "invalid id",
id: "foo",
version: "v1",
expectedErr: "unable to parse inventory entry id:",
expectedErr: "unable to parse stored object metadata:",
},
}

Expand All @@ -360,7 +360,7 @@ func TestResourceRefToUnstructured(t *testing.T) {
g.Expect(err).To(MatchError(MatchRegexp(tc.expectedErr)))
} else {
g.Expect(err).NotTo(HaveOccurred())
g.Expect(res).To(Equal(tc.expected))
g.Expect(&res).To(Equal(tc.expected))
}
})
}
Expand Down Expand Up @@ -402,5 +402,5 @@ func TestSanitizeUnstructuredSecret(t *testing.T) {

g := NewGomegaWithT(t)
g.Expect(err).NotTo(HaveOccurred())
g.Expect(secret).To(Equal(expected))
g.Expect(&secret).To(Equal(expected))
}

0 comments on commit dbea5b3

Please sign in to comment.