feat: add refresh_interval support to catalog_v2 (#2202)

Co-authored-by: Alejandro Moreno <alemorcuq@gmail.com>
Co-authored-by: Matt Trachier <matt.trachier@suse.com>

Author: 3 people

docs/data-sources/catalog_v2.md

@@ -29,6 +29,7 @@ data "rancher2_catalog_v2" "foo" {
 * `git_branch` - (Computed) Git Repository branch containing Helm chart definitions. Default `master` (string)
 * `git_repo` - (Computed) The url of the catalog v2 repo (string)
 * `insecure` - (Computed) Use insecure HTTPS to download the repo's index. Default: `false` (bool)
+* `refresh_interval` - (Computed) Interval in seconds at which the Helm repository should be refreshed (int)
 * `secret_name` - (Computed) K8s secret name to be used to connect to the repo (string)
 * `secret_namespace` - (Computed) K8s secret namespace (string)
 * `service_account` - (Computed) K8s service account used to deploy charts instead of the end users credentials (string)

docs/guides/apps_marketplace.md

@@ -29,6 +29,7 @@ This resource has the following arguments definition:
 * `git_branch` - (Optional) Git Repository branch containing Helm chart definitions. Default `master` (string)
 * `git_repo` - (Optional) The url of the catalog v2 repo (string)
 * `insecure` - (Optional) Use insecure HTTPS to download the repo's index. Default: `false` (bool)
+* `refresh_interval` - (Optional/Computed) Interval in seconds at which the Helm repository should be refreshed (int)
 * `secret_name` - (Optional) K8s secret name to be used to connect to the repo (string)
 * `secret_namespace` - (Optional) K8s secret namespace (string)
 * `service_account` - (Optional) K8s service account used to deploy charts instead of the end users credentials (string)

docs/resources/catalog_v2.md

@@ -35,6 +35,7 @@ The following arguments are supported:
 * `git_branch` - (Optional/Computed) Git Repository branch containing Helm chart definitions. Default `master` (string)
 * `git_repo` - (Optional) The url of the catalog v2 repo. Conflicts with `url` (string)
 * `insecure` - (Optional) Use insecure HTTPS to download the repo's index. Default: `false` (bool)
+* `refresh_interval` - (Optional/Computed) Interval in seconds at which the Helm repository should be refreshed (int)
 * `secret_name` - (Optional) K8s secret name to be used to connect to the repo (string)
 * `secret_namespace` - (Optional) K8s secret namespace (string)
 * `service_account` - (Optional) K8s service account used to deploy charts instead of the end users credentials (string)

rancher2/data_source_rancher2_catalog_v2.go

@@ -67,6 +67,11 @@ func dataSourceRancher2CatalogV2() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"refresh_interval": {
+				Type:        schema.TypeInt,
+				Computed:    true,
+				Description: "Interval in seconds at which the Helm repository should be refreshed",
+			},
 			"secret_name": {
 				Type:     schema.TypeString,
 				Computed: true,

rancher2/schema_catalog_v2.go

@@ -99,6 +99,12 @@ func catalogV2Fields() map[string]*schema.Schema {
 			Type:     schema.TypeString,
 			Computed: true,
 		},
+		"refresh_interval": {
+			Type:        schema.TypeInt,
+			Optional:    true,
+			Computed:    true,
+			Description: "Interval in seconds at which the Helm repository should be refreshed",
+		},
 		"secret_name": {
 			Type:        schema.TypeString,
 			Optional:    true,

rancher2/structure_catalog_v2.go

@@ -49,6 +49,7 @@ func flattenCatalogV2(d *schema.ResourceData, in *ClusterRepo) error {
 	}
 
 	d.Set("insecure_plain_http", in.Spec.InsecurePlainHTTP)
+	d.Set("refresh_interval", in.Spec.RefreshInterval)
 
 	d.Set("service_account", in.Spec.ServiceAccount)
 	d.Set("service_account_namespace", in.Spec.ServiceAccountNamespace)
@@ -155,6 +156,9 @@ func expandCatalogV2(in *schema.ResourceData) (*ClusterRepo, error) {
 	if v, ok := in.Get("url").(string); ok {
 		obj.Spec.URL = v
 	}
+	if v, ok := in.Get("refresh_interval").(int); ok && v > 0 {
+		obj.Spec.RefreshInterval = v
+	}
 
 	return obj, nil
 }

rancher2/structure_catalog_v2_test.go

@@ -46,6 +46,7 @@ func init() {
 	testCatalogV2Conf.Spec.ServiceAccount = "service_account"
 	testCatalogV2Conf.Spec.ServiceAccountNamespace = "service_account_namespace"
 	testCatalogV2Conf.Spec.URL = "url"
+	testCatalogV2Conf.Spec.RefreshInterval = 300
 
 	testCatalogV2Interface = map[string]interface{}{
 		"name":                            "name",
@@ -63,6 +64,7 @@ func init() {
 		"service_account":                 "service_account",
 		"service_account_namespace":       "service_account_namespace",
 		"url":                             "url",
+		"refresh_interval":                300,
 		"annotations": map[string]interface{}{
 			"value1": "one",
 			"value2": "two",