Revert "added in adapters of codebuild (#1184)"

This reverts commit ff5de60.
aquasecurity · May 3, 2023 · 0ab1543 · 0ab1543
1 parent d90254d
commit 0ab1543
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 87 deletions.
diff --git a/internal/adapters/cloud/aws/codebuild/adapt.go b/internal/adapters/cloud/aws/codebuild/adapt.go
@@ -95,32 +95,12 @@ func (a *adapter) adaptProject(name string) (*codebuild.Project, error) {
 		})
 	}
 
-	var encryptionkey, sourcetype string
-	if project.EncryptionKey != nil {
-		encryptionkey = *project.EncryptionKey
-	}
-
-	if project.Source != nil {
-		sourcetype = string(project.Source.Type)
-	}
-
-	var secondrysources []codebuild.SecondarySources
-	for _, s := range project.SecondarySources {
-		secondrysources = append(secondrysources, codebuild.SecondarySources{
-			Metadata: metadata,
-			Type:     defsecTypes.String(string(s.Type), metadata),
-		})
-	}
-
 	return &codebuild.Project{
-		Metadata:      metadata,
-		SourceType:    defsecTypes.String(sourcetype, metadata),
-		EncryptionKey: defsecTypes.String(encryptionkey, metadata),
+		Metadata: metadata,
 		ArtifactSettings: codebuild.ArtifactSettings{
 			Metadata:          metadata,
 			EncryptionEnabled: defsecTypes.Bool(encryptionEnabled, metadata),
 		},
 		SecondaryArtifactSettings: secondaryArtifactSettings,
-		SecondarySources:          secondrysources,
 	}, nil
 }
diff --git a/internal/adapters/cloudformation/aws/codebuild/project.go b/internal/adapters/cloudformation/aws/codebuild/project.go
@@ -13,11 +13,8 @@ func getProjects(ctx parser.FileContext) (projects []codebuild.Project) {
 	for _, r := range projectResources {
 		project := codebuild.Project{
 			Metadata:                  r.Metadata(),
-			EncryptionKey:             r.GetStringProperty("EncryptionKey"),
-			SourceType:                r.GetStringProperty("Source.Type"),
 			ArtifactSettings:          getArtifactSettings(r),
 			SecondaryArtifactSettings: getSecondaryArtifactSettings(r),
-			SecondarySources:          getSecondarySources(r),
 		}
 
 		projects = append(projects, project)
@@ -64,18 +61,3 @@ func getArtifactSettings(r *parser.Resource) codebuild.ArtifactSettings {
 
 	return settings
 }
-
-func getSecondarySources(r *parser.Resource) (secondarySources []codebuild.SecondarySources) {
-	secondarySourcesList := r.GetProperty("SecondarySources")
-	if secondarySourcesList.IsNil() || !secondarySourcesList.IsList() {
-		return
-	}
-
-	for _, s := range secondarySourcesList.AsList() {
-		secondarySources = append(secondarySources, codebuild.SecondarySources{
-			Metadata: s.Metadata(),
-			Type:     s.GetStringProperty("Type"),
-		})
-	}
-	return secondarySources
-}
diff --git a/internal/adapters/terraform/aws/codebuild/adapt.go b/internal/adapters/terraform/aws/codebuild/adapt.go
@@ -25,19 +25,12 @@ func adaptProjects(modules terraform.Modules) []codebuild.Project {
 func adaptProject(resource *terraform.Block) codebuild.Project {
 
 	project := codebuild.Project{
-		Metadata:      resource.GetMetadata(),
-		SourceType:    types.StringDefault("", resource.GetMetadata()),
-		EncryptionKey: resource.GetAttribute("encryption_key").AsStringValueOrDefault("", resource),
+		Metadata: resource.GetMetadata(),
 		ArtifactSettings: codebuild.ArtifactSettings{
 			Metadata:          resource.GetMetadata(),
 			EncryptionEnabled: types.BoolDefault(true, resource.GetMetadata()),
 		},
 		SecondaryArtifactSettings: nil,
-		SecondarySources:          nil,
-	}
-
-	if sourceblock := resource.GetBlock("source"); sourceblock.IsNotNil() {
-		project.SourceType = sourceblock.GetAttribute("type").AsStringValueOrDefault("CODECOMMIT", sourceblock)
 	}
 
 	var hasArtifacts bool
@@ -69,13 +62,5 @@ func adaptProject(resource *terraform.Block) codebuild.Project {
 		})
 	}
 
-	secondrysources := resource.GetBlocks("secondary_sources")
-	for _, ss := range secondrysources {
-		project.SecondarySources = append(project.SecondarySources, codebuild.SecondarySources{
-			Metadata: ss.GetMetadata(),
-			Type:     ss.GetAttribute("type").AsStringValueOrDefault("CODECOMMIT", ss),
-		})
-	}
-
 	return project
 }
diff --git a/pkg/providers/aws/codebuild/codebuild.go b/pkg/providers/aws/codebuild/codebuild.go
@@ -10,9 +10,6 @@ type CodeBuild struct {
 
 type Project struct {
 	Metadata                  defsecTypes.Metadata
-	SourceType                defsecTypes.StringValue
-	EncryptionKey             defsecTypes.StringValue
-	SecondarySources          []SecondarySources
 	ArtifactSettings          ArtifactSettings
 	SecondaryArtifactSettings []ArtifactSettings
 }
@@ -21,8 +18,3 @@ type ArtifactSettings struct {
 	Metadata          defsecTypes.Metadata
 	EncryptionEnabled defsecTypes.BoolValue
 }
-
-type SecondarySources struct {
-	Metadata defsecTypes.Metadata
-	Type     defsecTypes.StringValue
-}
diff --git a/pkg/rego/schemas/cloud.json b/pkg/rego/schemas/cloud.json
@@ -794,36 +794,12 @@
           "type": "object",
           "$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.defsec.pkg.providers.aws.codebuild.ArtifactSettings"
         },
-        "encryptionkey": {
-          "type": "object",
-          "$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.defsec.pkg.types.StringValue"
-        },
         "secondaryartifactsettings": {
           "type": "array",
           "items": {
             "type": "object",
             "$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.defsec.pkg.providers.aws.codebuild.ArtifactSettings"
           }
-        },
-        "secondarysources": {
-          "type": "array",
-          "items": {
-            "type": "object",
-            "$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.defsec.pkg.providers.aws.codebuild.SecondarySources"
-          }
-        },
-        "sourcetype": {
-          "type": "object",
-          "$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.defsec.pkg.types.StringValue"
-        }
-      }
-    },
-    "github.aaakk.us.kg.aquasecurity.defsec.pkg.providers.aws.codebuild.SecondarySources": {
-      "type": "object",
-      "properties": {
-        "type": {
-          "type": "object",
-          "$ref": "#/definitions/github.aaakk.us.kg.aquasecurity.defsec.pkg.types.StringValue"
         }
       }
     },