Merge pull request #685 from tailwarden/develop

Update Release v3.0.9
tailwarden · Mar 31, 2023 · 84062bb · 84062bb
2 parents 2731527 + 1d49704
commit 84062bb
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 153 deletions.
diff --git a/dashboard/components/dashboard/components/cloud-map/DashboardCloudMapChart.tsx b/dashboard/components/dashboard/components/cloud-map/DashboardCloudMapChart.tsx
@@ -5,6 +5,7 @@ import {
   Geography,
   Marker
 } from 'react-simple-maps';
+import Link from 'next/link';
 import { DashboardCloudMapRegions } from './hooks/useCloudMap';
 import { DashboardCloudMapTooltipProps } from './hooks/useCloudMapTooltip';
 
@@ -54,12 +55,7 @@ function DashboardCloudMapChart({
       </Geographies>
       {regionsAscendingByNumberOfResources &&
         regionsAscendingByNumberOfResources.map((region, idx) => (
-          <a
-            key={idx}
-            href={`/inventory?region:IS:${region.label}`}
-            target="_blank"
-            rel="noreferrer"
-          >
+          <Link key={idx} href={`/inventory?region:IS:${region.label}`}>
             <Marker
               coordinates={[Number(region.longitude), Number(region.latitude)]}
               onMouseEnter={e =>
@@ -87,7 +83,7 @@ function DashboardCloudMapChart({
                 strokeWidth={1.5}
               />
             </Marker>
-          </a>
+          </Link>
         ))}
     </ComposableMap>
   );

diff --git a/...oard/components/dashboard/components/resources-manager/hooks/useResourcesManagerChart.tsx b/...oard/components/dashboard/components/resources-manager/hooks/useResourcesManagerChart.tsx
@@ -1,5 +1,6 @@
 import { ChartData, ChartOptions } from 'chart.js';
 import { Dispatch, SetStateAction, useState } from 'react';
+import { useRouter } from 'next/router';
 import formatNumber from '../../../../../utils/formatNumber';
 import {
   ResourcesManagerData,
@@ -23,6 +24,7 @@ function useResourcesManagerChart({
   setQuery,
   initialQuery
 }: useResourcesManagerChartProps) {
+  const router = useRouter();
   const colors = ['#FF9A87', '#6DB7FF', '#B6D3B4', '#FFB459', '#59ACAC'];
 
   /* To be un-commented when 'view' is supported 
@@ -78,10 +80,7 @@ function useResourcesManagerChart({
       const clickedIndex = legendItem[0].index || 0;
       const labels = legend.config.data.labels ?? [];
 
-      window.open(
-        `./inventory?${currentQuery}:IS:${labels[clickedIndex]}`,
-        '_blank'
-      );
+      router.push(`/inventory?${currentQuery}:IS:${labels[clickedIndex]}`);
     },
     aspectRatio: 2,
     layout: {

diff --git a/dashboard/components/navbar/Navbar.tsx b/dashboard/components/navbar/Navbar.tsx
@@ -20,7 +20,7 @@ function Navbar() {
       <div className="flex items-center gap-8 text-sm font-semibold text-black-400">
         <Link href="/dashboard">
           <Image
-            src="./assets/img/komiser.svg"
+            src="/assets/img/komiser.svg"
             width={40}
             height={40}
             alt="Komiser logo"

diff --git a/dashboard/next.config.js b/dashboard/next.config.js
@@ -4,7 +4,8 @@ const nextConfig = {
   swcMinify: true,
   images: {
     unoptimized: true
-  }
+  },
+  trailingSlash: true
 };
 
 module.exports = nextConfig;
diff --git a/internal/api/v1/template.go b/internal/api/v1/template.go
diff --git a/providers/aws/aws.go b/providers/aws/aws.go
@@ -64,6 +64,7 @@ func listOfSupportedServices() []providers.FetchDataFunction {
 		apigateway.Apis,
 		elasticache.Clusters,
 		cloudwatch.Alarms,
+		ec2.NetworkInterfaces,
 		cloudwatch.Dashboards,
 		ec2.ElasticIps,
 	}

diff --git a/providers/aws/ec2/network_interfaces.go b/providers/aws/ec2/network_interfaces.go
@@ -0,0 +1,74 @@
+package ec2
+
+import (
+	"context"
+	"fmt"
+	"time"
+
+	log "github.com/sirupsen/logrus"
+
+	"github.com/aws/aws-sdk-go-v2/aws"
+	"github.com/aws/aws-sdk-go-v2/service/ec2"
+	"github.com/aws/aws-sdk-go-v2/service/sts"
+	. "github.com/tailwarden/komiser/models"
+	. "github.com/tailwarden/komiser/providers"
+)
+
+func NetworkInterfaces(ctx context.Context, client ProviderClient) ([]Resource, error) {
+	var config ec2.DescribeNetworkInterfacesInput
+	resources := make([]Resource, 0)
+	ec2Client := ec2.NewFromConfig(*client.AWSClient)
+
+	stsClient := sts.NewFromConfig(*client.AWSClient)
+	stsOutput, err := stsClient.GetCallerIdentity(ctx, &sts.GetCallerIdentityInput{})
+	if err != nil {
+		return resources, err
+	}
+
+	accountId := stsOutput.Account
+
+	for {
+		output, err := ec2Client.DescribeNetworkInterfaces(ctx, &config)
+		if err != nil {
+			return resources, err
+		}
+
+		for _, iface := range output.NetworkInterfaces {
+			tags := make([]Tag, 0)
+			for _, tag := range iface.TagSet {
+				tags = append(tags, Tag{
+					Key:   *tag.Key,
+					Value: *tag.Value,
+				})
+			}
+
+			resourceArn := fmt.Sprintf("arn:aws:ec2:%s:%s:network-interface/%s", client.AWSClient.Region, *accountId, *iface.NetworkInterfaceId)
+
+			resources = append(resources, Resource{
+				Provider:   "AWS",
+				Account:    client.Name,
+				Service:    "Network Interface",
+				Region:     client.AWSClient.Region,
+				ResourceId: resourceArn,
+				Cost:       0,
+				Name:       *iface.NetworkInterfaceId,
+				FetchedAt:  time.Now(),
+				Tags:       tags,
+				Link:       fmt.Sprintf("https:/%s.console.aws.amazon.com/ec2/home?region=%s#NetworkInterface:networkInterfaceId=%s", client.AWSClient.Region, client.AWSClient.Region, *iface.NetworkInterfaceId),
+			})
+		}
+		if aws.ToString(output.NextToken) == "" {
+			break
+		}
+
+		config.NextToken = output.NextToken
+	}
+	log.WithFields(log.Fields{
+		"provider":  "AWS",
+		"account":   client.Name,
+		"region":    client.AWSClient.Region,
+		"service":   "Network Interface",
+		"resources": len(resources),
+	}).Info("Fetched resources")
+	return resources, nil
+}