From af92bf84767b31189c5076ad656247f23526cbbf Mon Sep 17 00:00:00 2001 From: Allen Greaves Date: Fri, 20 Oct 2023 15:25:41 -0700 Subject: [PATCH 1/2] Remove conflict for release_train and version as these fields are allowed together --- ...c_kubernetes_cluster_extension_resource.go | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource.go b/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource.go index 0a0a006c4e28..e48ae392e0a5 100644 --- a/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource.go +++ b/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource.go @@ -117,12 +117,11 @@ func (r ArcKubernetesClusterExtensionResource) Arguments() map[string]*pluginsdk }, "release_train": { - Type: pluginsdk.TypeString, - Optional: true, - Computed: true, - ForceNew: true, - ConflictsWith: []string{"version"}, - ValidateFunc: validation.StringIsNotEmpty, + Type: pluginsdk.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + ValidateFunc: validation.StringIsNotEmpty, }, "release_namespace": { @@ -144,11 +143,10 @@ func (r ArcKubernetesClusterExtensionResource) Arguments() map[string]*pluginsdk }, "version": { - Type: pluginsdk.TypeString, - Optional: true, - ForceNew: true, - ConflictsWith: []string{"release_train"}, - ValidateFunc: validation.StringIsNotEmpty, + Type: pluginsdk.TypeString, + Optional: true, + ForceNew: true, + ValidateFunc: validation.StringIsNotEmpty, }, } From 5257deb2f4750980bce06b59525db46be84af7d1 Mon Sep 17 00:00:00 2001 From: Allen Greaves Date: Thu, 26 Oct 2023 13:07:44 -0700 Subject: [PATCH 2/2] Update azurerm_arc_kubernetes_cluster_extension acctest to have release_train set in complete test --- .../arc_kubernetes_cluster_extension_resource_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource_test.go b/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource_test.go index 8414ece1debd..9837045a2d92 100644 --- a/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource_test.go +++ b/internal/services/arckubernetes/arc_kubernetes_cluster_extension_resource_test.go @@ -177,6 +177,7 @@ resource "azurerm_arc_kubernetes_cluster_extension" "test" { name = "acctest-kce-%[2]d" cluster_id = azurerm_arc_kubernetes_cluster.test.id extension_type = "microsoft.flux" + release_train = "stable" version = "1.6.3" release_namespace = "flux-system"