AL-3019 - Add support to licensed image

dome9/common/testing/variable/variable.go

@@ -271,6 +271,8 @@ const (
 	MaxConcurrentScansPerRegionUpdate = "8"
 	InAccountScannerVPC               = "ManagedByAWP"
 	InAccountScannerVPCUpdate         = "ManagedByCustomer"
+	ScanAWSLicensedImages             = "false"
+	ScanAWSLicensedImagesUpdate       = "true"
 	CustomTags                        = `{
 			tag1 = "value1"
 			tag2 = "value2"

dome9/data_source_dome9_awp_aws_onboarding.go

@@ -43,6 +43,11 @@ func dataSourceAwpAwsOnboarding() *schema.Resource {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"scan_aws_licensed_images": {
+                            Type:     schema.TypeBool,
+                            Optional: true,
+                            Default:  false,
+                        },
 						"custom_tags": {
 							Type:     schema.TypeMap,
 							Computed: true,

dome9/data_source_dome9_awp_aws_onboarding_test.go

@@ -38,6 +38,7 @@ func TestAccDataSourceAwpAwsOnboardingBasic(t *testing.T) {
 					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "agentless_account_settings.0.scan_machine_interval_in_hours", awpAwsOnboardingResourceTypeAndName, "agentless_account_settings.0.scan_machine_interval_in_hours"),
 					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "agentless_account_settings.0.max_concurrent_scans_per_region", awpAwsOnboardingResourceTypeAndName, "agentless_account_settings.0.max_concurrent_scans_per_region"),
 					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "agentless_account_settings.0.in_account_scanner_vpc", awpAwsOnboardingResourceTypeAndName, "agentless_account_settings.0.in_account_scanner_vpc"),
+					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "agentless_account_settings.0.scan_aws_licensed_images", awpAwsOnboardingResourceTypeAndName, "agentless_account_settings.0.scan_aws_licensed_images"),
 					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "agentless_account_settings.0.custom_tags.%", awpAwsOnboardingResourceTypeAndName, "agentless_account_settings.0.custom_tags.%"),
 					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "missing_awp_private_network_regions", awpAwsOnboardingResourceTypeAndName, "missing_awp_private_network_regions"),
 					resource.TestCheckResourceAttrPair(awpAwsOnboardingDataSourceTypeAndName, "agentless_protection_enabled", awpAwsOnboardingResourceTypeAndName, "agentless_protection_enabled"),

dome9/resource_dome9_awp_aws_onboarding.go

@@ -86,6 +86,11 @@ func resourceAwpAwsOnboarding() *schema.Resource {
 							Optional: true,
 							Default:  "ManagedByAWP",
 						},
+						"scan_aws_licensed_images": {
+                            Type:     schema.TypeBool,
+                            Optional: true,
+                            Default:  false,
+                        },
 						"custom_tags": {
 							Type:     schema.TypeMap,
 							Optional: true,
@@ -276,6 +281,7 @@ func expandAgentlessAccountSettings(d *schema.ResourceData) (*awp_onboarding.Age
 		ScanMachineIntervalInHours:   scanMachineIntervalInHours,
 		InAccountScannerVPC:          providerconst.DefaultInAccountScannerVPCMode,
 		MaxConcurrenceScansPerRegion: providerconst.DefaultMaxConcurrentScansPerRegion,
+		ScanAWSLicensedImages:        false,
 	}
 
 	// Check if the key exists and is not nil
@@ -311,6 +317,10 @@ func expandAgentlessAccountSettings(d *schema.ResourceData) (*awp_onboarding.Age
 		agentlessAccountSettings.InAccountScannerVPC = inAccountScannerVPC
 	}
 
+	if ScanAWSLicensedImages, ok := agentlessAccountSettingsMap["scan_aws_licensed_images"].(bool); ok {
+		agentlessAccountSettings.ScanAWSLicensedImages = ScanAWSLicensedImages
+	}
+
 	if customTagsInterface, ok := agentlessAccountSettingsMap["custom_tags"].(map[string]interface{}); ok {
 		customTags := make(map[string]string)
 		for k, v := range customTagsInterface {
@@ -344,6 +354,7 @@ func flattenAgentlessAccountSettings(settings *awp_onboarding.AgentlessAccountSe
 		"scan_machine_interval_in_hours":  settings.ScanMachineIntervalInHours,
 		"max_concurrent_scans_per_region": settings.MaxConcurrenceScansPerRegion,
 		"in_account_scanner_vpc":          settings.InAccountScannerVPC,
+		"scan_aws_licensed_images":        settings.ScanAWSLicensedImages,
 		"custom_tags":                     settings.CustomTags,
 	}
 	return []interface{}{m}

dome9/resource_dome9_awp_aws_onboarding_test.go

@@ -51,6 +51,7 @@ func TestAccResourceAWPAWSOnboardingBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.scan_machine_interval_in_hours", variable.ScanMachineIntervalInHours),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.max_concurrent_scans_per_region", variable.MaxConcurrentScansPerRegion),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.in_account_scanner_vpc", variable.InAccountScannerVPC),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.scan_aws_licensed_images", variable.ScanAWSLicensedImages),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.custom_tags.%", "2"),
 					resource.TestCheckResourceAttrSet(resourceTypeAndName, "id"),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "cloud_provider", "aws"),
@@ -74,6 +75,7 @@ func TestAccResourceAWPAWSOnboardingBasic(t *testing.T) {
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.scan_machine_interval_in_hours", variable.ScanMachineIntervalInHoursUpdate),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.max_concurrent_scans_per_region", variable.MaxConcurrentScansPerRegionUpdate),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.in_account_scanner_vpc", variable.InAccountScannerVPCUpdate),
+					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.scan_aws_licensed_images", variable.ScanAWSLicensedImagesUpdate),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "agentless_account_settings.0.custom_tags.%", "3"),
 					resource.TestCheckResourceAttrSet(resourceTypeAndName, "id"),
 					resource.TestCheckResourceAttr(resourceTypeAndName, "cloud_provider", "aws"),
@@ -159,6 +161,7 @@ resource "%s" "%s" {
 		scan_machine_interval_in_hours = "%s"
 		max_concurrent_scans_per_region = "%s"
 		in_account_scanner_vpc = "%s"
+		scan_aws_licensed_images = "%s"
 		custom_tags = %s
 	}
 	awp_version = "%s"
@@ -174,6 +177,7 @@ resource "%s" "%s" {
 		IfThenElse(updateAction, variable.ScanMachineIntervalInHoursUpdate, variable.ScanMachineIntervalInHours),
 		IfThenElse(updateAction, variable.MaxConcurrentScansPerRegionUpdate, variable.MaxConcurrentScansPerRegion),
 		IfThenElse(updateAction, variable.InAccountScannerVPCUpdate, variable.InAccountScannerVPC),
+		IfThenElse(updateAction, variable.ScanAWSLicensedImagesUpdate, variable.ScanAWSLicensedImages),
 		IfThenElse(updateAction, variable.CustomTagsUpdate, variable.CustomTags),
 		"10", 
 	)