Merge pull request #204 from KoppulaRajender/clean_up_fix

feat: add auto_cleanup to registry resource

Author: semyonmor

aquasec/data_registry.go

@@ -61,6 +61,11 @@ func dataSourceRegistry() *schema.Resource {
 				Description: "The interval in days to start pulling new images from the registry, Defaults to 1",
 				Computed:    true,
 			},
+			"auto_cleanup": {
+				Type:        schema.TypeBool,
+				Description: "Automatically clean up images and repositories which are no longer present in the registry from Aqua console",
+				Computed:    true,
+			},
 			"image_creation_date_condition": {
 				Type:        schema.TypeString,
 				Description: "Additional condition for pulling and rescanning images, Defaults to 'none'",
@@ -124,6 +129,7 @@ func dataRegistryRead(d *schema.ResourceData, m interface{}) error {
 		d.Set("auto_pull_max", reg.AutoPullMax)
 		d.Set("auto_pull_time", reg.AutoPullTime)
 		d.Set("auto_pull_interval", reg.AutoPullInterval)
+		d.Set("auto_cleanup", reg.AutoCleanUp)
 		d.Set("scanner_type", reg.ScannerType)
 		d.Set("prefixes", convertStringArr(prefixes))
 		scannerType := d.Get("scanner_type").(string)

aquasec/resource_registry.go

@@ -82,6 +82,11 @@ func resourceRegistry() *schema.Resource {
 				Description: "The interval in days to start pulling new images from the registry, Defaults to 1",
 				Optional:    true,
 			},
+			"auto_cleanup": {
+				Type:        schema.TypeBool,
+				Description: "Automatically clean up images and repositories which are no longer present in the registry from Aqua console",
+				Optional:    true,
+			},
 			"image_creation_date_condition": {
 				Type:        schema.TypeString,
 				Description: "Additional condition for pulling and rescanning images, Defaults to 'none'",
@@ -177,6 +182,7 @@ func resourceRegistryCreate(d *schema.ResourceData, m interface{}) error {
 		AutoPullRescan:             d.Get("auto_pull_rescan").(bool),
 		AutoPullMax:                d.Get("auto_pull_max").(int),
 		AutoPullTime:               d.Get("auto_pull_time").(string),
+		AutoCleanUp:                d.Get("auto_cleanup").(bool),
 		ImageCreationDateCondition: d.Get("image_creation_date_condition").(string),
 		PullImageAge:               d.Get("pull_image_age").(string),
 		PullImageCount:             d.Get("pull_image_count").(int),
@@ -230,6 +236,9 @@ func resourceRegistryRead(d *schema.ResourceData, m interface{}) error {
 	if err = d.Set("auto_pull_interval", r.AutoPullInterval); err != nil {
 		return err
 	}
+	if err = d.Set("auto_cleanup", r.AutoCleanUp); err != nil {
+		return err
+	}
 	if err = d.Set("image_creation_date_condition", r.ImageCreationDateCondition); err != nil {
 		return err
 	}
@@ -288,7 +297,7 @@ func resourceRegistryUpdate(d *schema.ResourceData, m interface{}) error {
 		autoPullInterval = 1
 	}
 
-	if d.HasChanges("name", "username", "password", "url", "type", "auto_pull", "auto_pull_rescan", "auto_pull_max", "auto_pull_time", "auto_pull_interval", "image_creation_date_condition", "scanner_name", "prefixes", "pull_image_count", "pull_image_age", "options") {
+	if d.HasChanges("name", "username", "password", "url", "type", "auto_pull", "auto_pull_rescan", "auto_pull_max", "auto_pull_time", "auto_pull_interval", "auto_cleanup", "image_creation_date_condition", "scanner_name", "prefixes", "pull_image_count", "pull_image_age", "options") {
 
 		prefixes := d.Get("prefixes").([]interface{})
 		scanner_name := d.Get("scanner_name").([]interface{})
@@ -309,6 +318,7 @@ func resourceRegistryUpdate(d *schema.ResourceData, m interface{}) error {
 			AutoPullRescan:             d.Get("auto_pull_rescan").(bool),
 			AutoPullMax:                d.Get("auto_pull_max").(int),
 			AutoPullTime:               d.Get("auto_pull_time").(string),
+			AutoCleanUp:                d.Get("auto_cleanup").(bool),
 			AutoPullInterval:           autoPullInterval,
 			ImageCreationDateCondition: d.Get("image_creation_date_condition").(string),
 			PullImageAge:               d.Get("pull_image_age").(string),

client/registries.go

@@ -25,6 +25,7 @@ type Registry struct {
 	AutoPullTime               string      `json:"auto_pull_time"`
 	AutoPullMax                int         `json:"auto_pull_max"`
 	AutoPullInterval           int         `json:"auto_pull_interval"`
+	AutoCleanUp                bool        `json:"auto_cleanup"`
 	PullRepoPatterns           interface{} `json:"pull_repo_patterns"`
 	PullRepoPatternsExcluded   interface{} `json:"pull_repo_patterns_excluded"`
 	PullTagPatterns            interface{} `json:"pull_tag_patterns"`

docs/data-sources/integration_registries.md

@@ -29,6 +29,7 @@ description: |-
 
 ### Read-Only
 
+- `auto_cleanup` (Boolean) Automatically clean up images and repositories which are no longer present in the registry from Aqua console
 - `auto_pull` (Boolean) Whether to automatically pull images from the registry on creation and daily
 - `auto_pull_interval` (Number) The interval in days to start pulling new images from the registry, Defaults to 1
 - `auto_pull_max` (Number) Maximum number of repositories to pull every day, defaults to 100

docs/resources/integration_registry.md

@@ -23,6 +23,7 @@ description: |-
 ### Optional
 
 - `author` (String) The username of the user who created or last modified the registry
+- `auto_cleanup` (Boolean) Automatically clean up images and repositories which are no longer present in the registry from Aqua console
 - `auto_pull` (Boolean) Whether to automatically pull images from the registry on creation and daily
 - `auto_pull_interval` (Number) The interval in days to start pulling new images from the registry, Defaults to 1
 - `auto_pull_max` (Number) Maximum number of repositories to pull every day, defaults to 100