Enhance cloud app network insights and visibility by reporting the ip addresses of workloads (#294)

Author: omris94

src/mapper/cmd/main.go

@@ -22,7 +22,7 @@ import (
 	"github.com/otterize/network-mapper/src/mapper/pkg/externaltrafficholder"
 	"github.com/otterize/network-mapper/src/mapper/pkg/gcpintentsholder"
 	"github.com/otterize/network-mapper/src/mapper/pkg/incomingtrafficholder"
-	"github.com/otterize/network-mapper/src/mapper/pkg/labelreporter"
+	"github.com/otterize/network-mapper/src/mapper/pkg/metadatareporter"
 	"github.com/otterize/network-mapper/src/mapper/pkg/metrics_collection_traffic"
 	"github.com/otterize/network-mapper/src/mapper/pkg/networkpolicyreport"
 	"github.com/otterize/network-mapper/src/mapper/pkg/resourcevisibility"
@@ -237,14 +237,8 @@ func main() {
 			logrus.WithError(err).Panic("unable to create service reconciler")
 		}
 
-		podReconciler := labelreporter.NewPodReconciler(mgr.GetClient(), cloudClient, serviceIdResolver)
-		if err := podReconciler.SetupWithManager(mgr); err != nil {
-			logrus.WithError(err).Panic("unable to create pod reconciler")
-		}
-
-		namespaceReconciler := labelreporter.NewNamespaceReconciler(mgr.GetClient(), cloudClient)
-		if err := namespaceReconciler.SetupWithManager(mgr); err != nil {
-			logrus.WithError(err).Panic("unable to create namespace reconciler")
+		if err := metadatareporter.Setup(mgr.GetClient(), cloudClient, serviceIdResolver, mgr); err != nil {
+			logrus.WithError(err).Panic("unable to create metadata reporter")
 		}
 
 		metricsCollectionTrafficHandler := metrics_collection_traffic.NewMetricsCollectionTrafficHandler(mgr.GetClient(), serviceidresolver.NewResolver(mgr.GetClient()), cloudClient)

src/mapper/pkg/cloudclient/cloud_client.go

@@ -17,7 +17,7 @@ type CloudClient interface {
 	ReportK8sIngresses(ctx context.Context, namespace string, ingresses []K8sIngressInput) error
 	ReportTrafficLevels(ctx context.Context, trafficLevels []TrafficLevelInput) error
 	ReportNamespaceLabels(ctx context.Context, namespace string, labels []LabelInput) error
-	ReportWorkloadsLabels(ctx context.Context, workloadsLabels []ReportServiceMetadataInput) error
+	ReportWorkloadsMetadata(ctx context.Context, workloadsLabels []ReportServiceMetadataInput) error
 	ReportK8sResourceEligibleForMetricsCollection(ctx context.Context, namespace string, reason EligibleForMetricsCollectionReason, resources []K8sResourceEligibleForMetricsCollectionInput) error
 	ReportNetworkPolicies(ctx context.Context, namespace string, policies []NetworkPolicyInput) error
 	ReportCiliumClusterWideNetworkPolicies(ctx context.Context, policies []NetworkPolicyInput) error
@@ -148,13 +148,13 @@ func (c *CloudClientImpl) ReportNamespaceLabels(ctx context.Context, namespace s
 	return nil
 }
 
-func (c *CloudClientImpl) ReportWorkloadsLabels(ctx context.Context, workloadsLabels []ReportServiceMetadataInput) error {
+func (c *CloudClientImpl) ReportWorkloadsMetadata(ctx context.Context, workloadsMetadata []ReportServiceMetadataInput) error {
 	logrus.Debugf("Uploading workloads labels to cloud")
 
-	_, err := ReportWorkloadsLabels(
+	_, err := ReportWorkloadsMetadata(
 		ctx,
 		c.client,
-		workloadsLabels,
+		workloadsMetadata,
 	)
 	if err != nil {
 		return errors.Wrap(err)

src/mapper/pkg/cloudclient/generated.go

@@ -37,7 +37,7 @@ mutation ReportNamespaceLabels($name: String!, $labels: [LabelInput!]!) {
     reportNamespaceLabels(name: $name, labels: $labels)
 }
 
-mutation ReportWorkloadsLabels($workloadsLabels: [ReportServiceMetadataInput!]!) {
+mutation ReportWorkloadsMetadata($workloadsLabels: [ReportServiceMetadataInput!]!) {
     reportServicesMetadata(servicesMeta: $workloadsLabels)
 }
 

src/mapper/pkg/cloudclient/genqlient.graphql

@@ -845,6 +845,7 @@ input ExternalTrafficIntentInput {
 	clientName: String!
 	target: DNSIPPairInput!
 	connectionsCount: ConnectionsCount
+	ttl: Time
 }
 
 input ExternallyAccessibleServiceInput {
@@ -2149,6 +2150,7 @@ type Mutation {
 		namespace: String
 		networkPolicies: [NetworkPolicyInput!]
 	): Boolean!
+	computeNetworkPoliciesForOrg: Boolean!
 """Create a new organization"""
 	createOrganization(
 		name: String
@@ -2208,6 +2210,9 @@ type Mutation {
 		userEmail: String!
 		feedback: String!
 	): Boolean!
+	saveOrgMemberships(
+		memberships: [UserOrgMembershipInput!]!
+	): Boolean!
 	createOrActivateTutorial(
 		tutorialName: TutorialName!
 	): Boolean!
@@ -2335,13 +2340,21 @@ type Organization {
 type OrganizationMembership {
 	role: AuthRole!
 	restrictions: OrganizationMembershipRestrictions
+	restrictionResources: OrganizationMembershipRestrictionResources
 }
 
 input OrganizationMembershipInput {
 	role: AuthRole!
 	restrictions: OrganizationMembershipRestrictionsInput
 }
 
+type OrganizationMembershipRestrictionResources {
+	clusters: [Cluster!]!
+	services: [Service!]!
+	namespaces: [Namespace!]!
+	environments: [Environment!]!
+}
+
 type OrganizationMembershipRestrictions {
 	clusterIds: IDFilterValue
 	serviceIds: IDFilterValue
@@ -2630,6 +2643,8 @@ type Query {
 	): TerraformResourceInfo!
 """List users"""
 	users: [User!]!
+"""List users with restriction resources"""
+	orgUsersWithRestrictionResources: UsersWithRestrictionResources!
 	orgUsers: [UserOrganizationAssociation!]!
 """Get user"""
 	user(
@@ -2902,6 +2917,8 @@ input ServiceMetadataInput {
 	tags: [String!]
 	awsRoles: [String!]
 	labels: [LabelInput!]
+	podIps: [String!]
+	serviceIps: [String!]
 }
 
 enum ServiceType {
@@ -3141,6 +3158,11 @@ enum UserErrorType {
 	TIMEOUT
 }
 
+input UserOrgMembershipInput {
+	userId: ID!
+	membership: OrganizationMembershipInput!
+}
+
 type UserOrganizationAssociation {
 	org: Organization!
 	user: User!
@@ -3159,6 +3181,11 @@ type UserTutorial {
 	stepSeen: String!
 }
 
+type UsersWithRestrictionResources {
+	orgUsers: [UserOrganizationAssociation!]!
+	restrictionResources: OrganizationMembershipRestrictionResources
+}
+
 """ Used to validate ID based filters """
 type ValidIDFilter {
 	clusterIds: IDFilterValue