Add an option to filter out preview aks releases when fetching versions

hashicorp · Feb 10, 2020 · 6c56d41 · 6c56d41
1 parent b7f7eb7
commit 6c56d41
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 0 deletions.
diff --git a/azurerm/internal/services/containers/data_source_kubernetes_service_version.go b/azurerm/internal/services/containers/data_source_kubernetes_service_version.go
@@ -40,6 +40,12 @@ func dataSourceArmKubernetesServiceVersions() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+
+			"allow_preview": {
+				Type:     schema.TypeBool,
+				Optional: true,
+				Default:  false,
+			},
 		},
 	}
 }
@@ -66,6 +72,7 @@ func dataSourceArmKubernetesServiceVersionsRead(d *schema.ResourceData, meta int
 
 	var versions []string
 	versionPrefix := d.Get("version_prefix").(string)
+	allowPreview := d.Get("allow_preview").(bool)
 
 	if props := listResp.OrchestratorVersionProfileProperties; props != nil {
 		if orchestrators := props.Orchestrators; orchestrators != nil {
@@ -74,9 +81,17 @@ func dataSourceArmKubernetesServiceVersionsRead(d *schema.ResourceData, meta int
 					continue
 				}
 
+				isPreview := false
 				orchestratorType := *rawV.OrchestratorType
 				kubeVersion := *rawV.OrchestratorVersion
 
+				if rawV.IsPreview == nil {
+					log.Printf("[DEBUG] IsPreview is nil")
+				} else {
+					isPreview = *rawV.IsPreview
+					log.Printf("[DEBUG] IsPreview is %t", isPreview)
+				}
+
 				if !strings.EqualFold(orchestratorType, "Kubernetes") {
 					log.Printf("[DEBUG] Orchestrator %q was not Kubernetes", orchestratorType)
 					continue
@@ -87,6 +102,11 @@ func dataSourceArmKubernetesServiceVersionsRead(d *schema.ResourceData, meta int
 					continue
 				}
 
+				if (isPreview) && (allowPreview == false) {
+					log.Printf("[DEBUG] Orchestrator %q is a preview release, ignoring", kubeVersion)
+					continue
+				}
+
 				versions = append(versions, kubeVersion)
 				v, err := version.NewVersion(kubeVersion)
 				if err != nil {

diff --git a/azurerm/internal/services/containers/tests/data_source_kubernetes_service_version_test.go b/azurerm/internal/services/containers/tests/data_source_kubernetes_service_version_test.go
@@ -53,6 +53,27 @@ func TestAccDataSourceAzureRMKubernetesServiceVersions_filtered(t *testing.T) {
 	})
 }
 
+func TestAccDataSourceAzureRMKubernetesServiceVersions_nopreview(t *testing.T) {
+	data := acceptance.BuildTestData(t, "data.azurerm_kubernetes_service_versions", "test")
+	kvrx := regexp.MustCompile(k8sVersionRX)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:  func() { acceptance.PreCheck(t) },
+		Providers: acceptance.SupportedProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccDataSourceAzureRMKubernetesServiceVersions_nopreview(data),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet(data.ResourceName, "versions.#"),
+					resource.TestMatchResourceAttr(data.ResourceName, "versions.0", kvrx),
+					resource.TestCheckResourceAttrSet(data.ResourceName, "latest_version"),
+					resource.TestMatchResourceAttr(data.ResourceName, "latest_version", kvrx),
+				),
+			},
+		},
+	})
+}
+
 func testAccDataSourceAzureRMKubernetesServiceVersions_basic(data acceptance.TestData) string {
 	return fmt.Sprintf(`
 data "azurerm_kubernetes_service_versions" "test" {
@@ -69,3 +90,12 @@ data "azurerm_kubernetes_service_versions" "test" {
 }
 `, data.Locations.Primary)
 }
+
+func testAccDataSourceAzureRMKubernetesServiceVersions_nopreview(data acceptance.TestData) string {
+	return fmt.Sprintf(`
+data "azurerm_kubernetes_service_versions" "test" {
+  location = "%s"
+  allow_preview = false
+}
+`, data.Locations.Primary)
+}