fix acceptance tests (#205)

* fix acceptance tests * Breaking change: allow_privileged_containers removed from kubernetes cluster data source. --------- Co-authored-by: Aravind Ragavendran <[email protected]> Co-authored-by: do87 <[email protected]>
SchwarzIT · Oct 30, 2023 · 7027e10 · 7027e10
1 parent f312d82
commit 7027e10
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 33 deletions.
diff --git a/docs/data-sources/kubernetes_cluster.md b/docs/data-sources/kubernetes_cluster.md
@@ -35,7 +35,6 @@ data "stackit_kubernetes_cluster" "example" {
 
 ### Optional
 
-- `allow_privileged_containers` (Boolean) Should containers be allowed to run in privileged mode?
 - `kubernetes_project_id` (String, Deprecated) The ID of a `stackit_kubernetes_project` resource
 - `node_pools` (Attributes List) One or more `node_pool` block as defined below (see [below for nested schema](#nestedatt--node_pools))
 

diff --git a/docs/resources/rabbitmq_credential.md b/docs/resources/rabbitmq_credential.md
@@ -22,8 +22,8 @@ Manages RabbitMQ credentials
 resource "stackit_rabbitmq_instance" "example" {
   name       = "example"
   project_id = "example"
-  version    = "3.7"
-  plan       = "stackit-rabbitmq-single-small"
+  version    = "3.10"
+  plan       = "stackit-rabbitmq-2.4.10-single"
 }
 
 resource "stackit_rabbitmq_credential" "example" {

diff --git a/examples/resources/stackit_rabbitmq_credential/resource.tf b/examples/resources/stackit_rabbitmq_credential/resource.tf
@@ -1,8 +1,8 @@
 resource "stackit_rabbitmq_instance" "example" {
   name       = "example"
   project_id = "example"
-  version    = "3.7"
-  plan       = "stackit-rabbitmq-single-small"
+  version    = "3.10"
+  plan       = "stackit-rabbitmq-2.4.10-single"
 }
 
 resource "stackit_rabbitmq_credential" "example" {

diff --git a/stackit/internal/data-sources/data-services/instance/data_source_rabbitmq_test.go b/stackit/internal/data-sources/data-services/instance/data_source_rabbitmq_test.go
@@ -21,9 +21,9 @@ func TestAcc_DataSourceRabbitMQInstanceJob(t *testing.T) {
 	}
 
 	name := "odjtest-" + acctest.RandStringFromCharSet(7, acctest.CharSetAlpha)
-	plan := "stackit-rabbitmq-single-small"
-	planID := "4bc417ff-cb98-4064-bb56-8a2654120768"
-	version := "3.7"
+	plan := "stackit-rabbitmq-2.4.10-single"
+	planID := "7e1f8394-5dd5-40b1-8608-16b4344eb51b"
+	version := "3.10"
 
 	resource.ParallelTest(t, resource.TestCase{
 		ProtoV6ProviderFactories: map[string]func() (tfprotov6.ProviderServer, error){

diff --git a/stackit/internal/data-sources/kubernetes/cluster/data_source_test.go b/stackit/internal/data-sources/kubernetes/cluster/data_source_test.go
@@ -30,7 +30,6 @@ func TestAcc_kubernetes(t *testing.T) {
 				Config: config(name, "nodepl", "c1.2"),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr("data.stackit_kubernetes_cluster.example", "name", name),
-					resource.TestCheckResourceAttr("data.stackit_kubernetes_cluster.example", "allow_privileged_containers", ""),
 					resource.TestCheckResourceAttr("data.stackit_kubernetes_cluster.example", "node_pools.0.name", "nodepl"),
 					resource.TestCheckResourceAttr("data.stackit_kubernetes_cluster.example", "node_pools.0.machine_type", "c1.2"),
 					resource.TestCheckResourceAttr("data.stackit_kubernetes_cluster.example", "node_pools.0.os_name", "flatcar"),

diff --git a/stackit/internal/data-sources/kubernetes/cluster/helpers.go b/stackit/internal/data-sources/kubernetes/cluster/helpers.go
@@ -14,11 +14,6 @@ func transform(c *Cluster, cl *cluster.Cluster) {
 	}
 	c.KubernetesVersion = types.StringValue(cl.Kubernetes.Version)
 	c.KubernetesVersionUsed = types.StringValue(cl.Kubernetes.Version)
-	if cl.Kubernetes.AllowPrivilegedContainers != nil {
-		c.AllowPrivilegedContainers = types.BoolValue(*cl.Kubernetes.AllowPrivilegedContainers)
-	} else {
-		c.AllowPrivilegedContainers = types.BoolNull()
-	}
 	if cl.Status.Aggregated != nil {
 		c.Status = types.StringValue(string(*cl.Status.Aggregated))
 	}

diff --git a/stackit/internal/data-sources/kubernetes/cluster/schema.go b/stackit/internal/data-sources/kubernetes/cluster/schema.go
@@ -15,19 +15,18 @@ import (
 )
 
 type Cluster struct {
-	ID                        types.String          `tfsdk:"id"`
-	Name                      types.String          `tfsdk:"name"`
-	ProjectID                 types.String          `tfsdk:"project_id"`
-	KubernetesProjectID       types.String          `tfsdk:"kubernetes_project_id"`
-	KubernetesVersion         types.String          `tfsdk:"kubernetes_version"`
-	KubernetesVersionUsed     types.String          `tfsdk:"kubernetes_version_used"`
-	AllowPrivilegedContainers types.Bool            `tfsdk:"allow_privileged_containers"`
-	NodePools                 []cluster.NodePool    `tfsdk:"node_pools"`
-	Maintenance               *cluster.Maintenance  `tfsdk:"maintenance"`
-	Hibernations              []cluster.Hibernation `tfsdk:"hibernations"`
-	Extensions                *cluster.Extensions   `tfsdk:"extensions"`
-	Status                    types.String          `tfsdk:"status"`
-	KubeConfig                types.String          `tfsdk:"kube_config"`
+	ID                    types.String          `tfsdk:"id"`
+	Name                  types.String          `tfsdk:"name"`
+	ProjectID             types.String          `tfsdk:"project_id"`
+	KubernetesProjectID   types.String          `tfsdk:"kubernetes_project_id"`
+	KubernetesVersion     types.String          `tfsdk:"kubernetes_version"`
+	KubernetesVersionUsed types.String          `tfsdk:"kubernetes_version_used"`
+	NodePools             []cluster.NodePool    `tfsdk:"node_pools"`
+	Maintenance           *cluster.Maintenance  `tfsdk:"maintenance"`
+	Hibernations          []cluster.Hibernation `tfsdk:"hibernations"`
+	Extensions            *cluster.Extensions   `tfsdk:"extensions"`
+	Status                types.String          `tfsdk:"status"`
+	KubeConfig            types.String          `tfsdk:"kube_config"`
 }
 
 // Schema returns the terraform schema structure
@@ -72,12 +71,6 @@ func (d *DataSource) Schema(ctx context.Context, req datasource.SchemaRequest, r
 				Description: "Full Kubernetes version used. For example, if `1.22` was selected, this value may result to `1.22.15`",
 				Computed:    true,
 			},
-			"allow_privileged_containers": schema.BoolAttribute{
-				Description: "Should containers be allowed to run in privileged mode?",
-				Optional:    true,
-				Computed:    true,
-			},
-
 			"node_pools": schema.ListNestedAttribute{
 				Description: "One or more `node_pool` block as defined below",
 				Optional:    true,