fix AWS & GCP test cases

elastic · Apr 16, 2024 · e157186 · e157186
1 parent 6e8f5cc
commit e157186
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/internal/resources/fetching/fetchers/aws/iam_fetcher_test.go b/internal/resources/fetching/fetchers/aws/iam_fetcher_test.go
@@ -367,7 +367,12 @@ func (s *IamFetcherTestSuite) TestIamResource_GetMetadata() {
 
 			m, err := iamResource.GetElasticCommonData()
 			s.Require().NoError(err)
-			s.Len(m, 1)
+			switch iamResource.GetResourceType() {
+			case fetching.IAMUserType, fetching.PolicyType:
+				s.Len(m, 3)
+			default:
+				s.Len(m, 1)
+			}
 			s.Contains(m, "cloud.service.name")
 		})
 	}

diff --git a/internal/resources/fetching/fetchers/azure/assets_fetcher.go b/internal/resources/fetching/fetchers/azure/assets_fetcher.go
@@ -177,12 +177,9 @@ func (r *AzureResource) GetMetadata() (fetching.ResourceMetadata, error) {
 func (r *AzureResource) GetElasticCommonData() (map[string]any, error) {
 	m := map[string]any{}
 
-	switch r.Asset.Type {
-	case fetching.AzureRoleDefinitionType:
-		{
-			m["user.effective.id"] = r.Asset.Id
-			m["user.effective.name"] = r.Asset.Name
-		}
+	if r.Asset.Type == fetching.AzureRoleDefinitionType {
+		m["user.effective.id"] = r.Asset.Id
+		m["user.effective.name"] = r.Asset.Name
 	}
 
 	return m, nil

diff --git a/internal/resources/fetching/fetchers/gcp/assets_fetcher.go b/internal/resources/fetching/fetchers/gcp/assets_fetcher.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/elastic/elastic-agent-libs/logp"
 	"github.com/huandu/xstrings"
-	structpb "google.golang.org/protobuf/types/known/structpb"
+	"google.golang.org/protobuf/types/known/structpb"
 
 	"github.com/elastic/cloudbeat/internal/resources/fetching"
 	"github.com/elastic/cloudbeat/internal/resources/fetching/cycle"

diff --git a/internal/resources/fetching/fetchers/gcp/assets_fetcher_test.go b/internal/resources/fetching/fetchers/gcp/assets_fetcher_test.go
@@ -94,5 +94,10 @@ func (s *GcpAssetsFetcherTestSuite) TestFetcher_Fetch() {
 		s.Equal("prjId", cloudAccountMetadata.AccountId)
 		s.Equal("orgId", cloudAccountMetadata.OrganisationId)
 		s.Equal("orgName", cloudAccountMetadata.OrganizationName)
+		if metadata.Type == fetching.CloudIdentity {
+			m, err := r.GetElasticCommonData()
+			s.Require().NoError(err, "error getting Elastic Common Data")
+			s.Len(m, 2)
+		}
 	})
 }