aws sg analysis

cmd/analyzer/main_test.go

@@ -25,6 +25,12 @@ func TestMain(t *testing.T) {
 		name string
 		args string
 	}{
+		// aws
+		{
+			name: "aws_all_endpoints",
+			args: "report endpoints -f aws.txt -c ../../pkg/awsvpc/examples/input/input_basic_config_with_sg.json -o txt",
+		},
+		// drawio
 		{
 			name: "drawio_multi_vpc_all_subnets",
 			args: "report subnets -f multi_vpc.drawio --config ../../pkg/ibmvpc/examples/input/input_multiple_vpcs.json -o drawio",

cmd/analyzer/subcmds/vpcconfigs.go

@@ -15,39 +15,14 @@ import (
 	"github.com/np-guard/cloud-resource-collector/pkg/common"
 	"github.com/np-guard/cloud-resource-collector/pkg/factory"
 	"github.com/np-guard/cloud-resource-collector/pkg/ibm/datamodel"
+	"github.com/np-guard/vpc-network-config-analyzer/pkg/awsvpc"
+	"github.com/np-guard/vpc-network-config-analyzer/pkg/commonvpc"
 	"github.com/np-guard/vpc-network-config-analyzer/pkg/ibmvpc"
 	"github.com/np-guard/vpc-network-config-analyzer/pkg/vpcmodel"
 )
 
 const notSupportedYet = "provider %s is not supported yet"
 
-func mergeResourcesContainers(rc1, rc2 *datamodel.ResourcesContainerModel) (*datamodel.ResourcesContainerModel, error) {
-	if rc2 == nil && rc1 != nil {
-		return rc1, nil
-	}
-	if rc2 != nil && rc1 == nil {
-		return rc2, nil
-	}
-	if rc2 == nil && rc1 == nil {
-		return nil, fmt.Errorf("error merging input vpc resources files")
-	}
-	rc1.VpcList = append(rc1.VpcList, rc2.VpcList...)
-	rc1.SubnetList = append(rc1.SubnetList, rc2.SubnetList...)
-	rc1.PublicGWList = append(rc1.PublicGWList, rc2.PublicGWList...)
-	rc1.FloatingIPList = append(rc1.FloatingIPList, rc2.FloatingIPList...)
-	rc1.NetworkACLList = append(rc1.NetworkACLList, rc2.NetworkACLList...)
-	rc1.SecurityGroupList = append(rc1.SecurityGroupList, rc2.SecurityGroupList...)
-	rc1.EndpointGWList = append(rc1.EndpointGWList, rc2.EndpointGWList...)
-	rc1.InstanceList = append(rc1.InstanceList, rc2.InstanceList...)
-	rc1.RoutingTableList = append(rc1.RoutingTableList, rc2.RoutingTableList...)
-	rc1.LBList = append(rc1.LBList, rc2.LBList...)
-	rc1.TransitConnectionList = append(rc1.TransitConnectionList, rc2.TransitConnectionList...)
-	rc1.TransitGatewayList = append(rc1.TransitGatewayList, rc2.TransitGatewayList...)
-	rc1.IKSClusters = append(rc1.IKSClusters, rc2.IKSClusters...)
-
-	return rc1, nil
-}
-
 // Helper function for unmarshalling
 func jsonToMap(jsonStr []byte) (map[string]json.RawMessage, error) {
 	var result map[string]json.RawMessage
@@ -76,30 +51,21 @@ func parseProviderFromFile(fileName string) (common.Provider, error) {
 }
 
 func vpcConfigsFromFiles(fileNames []string, inArgs *inArgs) (*vpcmodel.MultipleVPCConfigs, error) {
-	var mergedRC *datamodel.ResourcesContainerModel
-	for _, file := range fileNames {
-		provider, err := parseProviderFromFile(file)
-		if err != nil {
-			return nil, err
-		}
-		if provider == common.IBM {
-			rc, err1 := ibmvpc.ParseResourcesFromFile(file)
-			if err1 != nil {
-				return nil, fmt.Errorf("error parsing input vpc resources file: %w", err1)
-			}
-			mergedRC, err1 = mergeResourcesContainers(mergedRC, rc)
-			if err1 != nil {
-				return nil, err1
-			}
-		} else {
-			return nil, fmt.Errorf(notSupportedYet, provider)
-		}
+	// len(fileNames) can not be zero
+	provider, err := parseProviderFromFile(fileNames[0])
+	if err != nil {
+		return nil, err
 	}
-	vpcConfigs, err2 := ibmvpc.VPCConfigsFromResources(mergedRC, inArgs.vpc, inArgs.resourceGroup, inArgs.regionList)
-	if err2 != nil {
-		return nil, fmt.Errorf("error generating cloud config from input vpc resources file: %w", err2)
+	var rc commonvpc.ResourcesContainer
+	switch provider {
+	case common.IBM:
+		rc = &ibmvpc.IBMresourcesContainer{}
+	case common.AWS:
+		rc = &awsvpc.AWSresourcesContainer{}
+	default:
+		return nil, fmt.Errorf(notSupportedYet, provider)
 	}
-	return vpcConfigs, nil
+	return rc.VpcConfigsFromFiles(fileNames, inArgs.vpc, inArgs.resourceGroup, inArgs.regionList)
 }
 
 func vpcConfigsFromAccount(inArgs *inArgs) (*vpcmodel.MultipleVPCConfigs, error) {
@@ -117,7 +83,8 @@ func vpcConfigsFromAccount(inArgs *inArgs) (*vpcmodel.MultipleVPCConfigs, error)
 		if !ok {
 			return nil, fmt.Errorf("error casting resources to *datamodel.ResourcesContainerModel type")
 		}
-		vpcConfigs, err = ibmvpc.VPCConfigsFromResources(ibmResources, inArgs.vpc, inArgs.resourceGroup, inArgs.regionList)
+		rc := ibmvpc.IBMresourcesContainer{ResourcesContainerModel: *ibmResources}
+		vpcConfigs, err = rc.VPCConfigsFromResources(inArgs.vpc, inArgs.resourceGroup, inArgs.regionList)
 		if err != nil {
 			return nil, err
 		}