Remove region field

Author: Yago Carlos Fernandez Gou

docs/data-sources/intake_runner.md

@@ -18,7 +18,6 @@ Datasource for STACKIT Intake Runner.
 ### Required
 
 - `project_id` (String) STACKIT Project ID to which the runner is associated.
-- `region` (String) The resource region.
 - `runner_id` (String) The runner ID.
 
 ### Read-Only

docs/index.md

@@ -163,7 +163,7 @@ Note: AWS specific checks must be skipped as they do not work on STACKIT. For de
 - `experiments` (List of String) Enables experiments. These are unstable features without official support. More information can be found in the README. Available Experiments: iam, routing-tables, network
 - `git_custom_endpoint` (String) Custom endpoint for the Git service
 - `iaas_custom_endpoint` (String) Custom endpoint for the IaaS service
-- `intake_custom_endpoint` (String)
+- `intake_custom_endpoint` (String) Custom endpoint for the Intake service
 - `kms_custom_endpoint` (String) Custom endpoint for the KMS service
 - `loadbalancer_custom_endpoint` (String) Custom endpoint for the Load Balancer service
 - `logme_custom_endpoint` (String) Custom endpoint for the LogMe service

stackit/internal/services/intake/runner/data_source.go

@@ -45,7 +45,7 @@ func (r *runnerDataSource) Configure(ctx context.Context, req datasource.Configu
 		return
 	}
 
-	r.client := intakeUtils.ConfigureClient(ctx, &providerData, &resp.Diagnostics)
+	apiClient := intakeUtils.ConfigureClient(ctx, &providerData, &resp.Diagnostics)
 	if resp.Diagnostics.HasError() {
 		return
 	}
@@ -61,7 +61,6 @@ func (r *runnerDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
 		"project_id":            "STACKIT Project ID to which the runner is associated.",
 		"runner_id":             "The runner ID.",
 		"name":                  "The name of the runner.",
-		"region":                "The resource region.",
 		"description":           "The description of the runner.",
 		"labels":                "User-defined labels.",
 		"max_message_size_kib":  "The maximum message size in KiB.",
@@ -91,10 +90,6 @@ func (r *runnerDataSource) Schema(_ context.Context, _ datasource.SchemaRequest,
 					validate.NoSeparator(),
 				},
 			},
-			"region": schema.StringAttribute{
-				Description: descriptions["region"],
-				Required:    true,
-			},
 			"name": schema.StringAttribute{
 				Description: descriptions["name"],
 				Computed:    true,

stackit/internal/services/intake/runner/resource_acc_test.go

@@ -29,7 +29,6 @@ func TestAccIntakeRunner(t *testing.T) {
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttr(intakeRunnerResource, "project_id", testutil.ProjectId),
 					resource.TestCheckResourceAttr(intakeRunnerResource, "name", "example-runner-minimal"),
-					resource.TestCheckResourceAttr(intakeRunnerResource, "region", "eu01"),
 					resource.TestCheckResourceAttrSet(intakeRunnerResource, "runner_id"),
 					resource.TestCheckResourceAttr(intakeRunnerResource, "description", ""),
 					resource.TestCheckResourceAttr(intakeRunnerResource, "labels.%", "0"),
@@ -74,7 +73,6 @@ func testAccIntakeRunnerConfigMinimal(name string) string {
         resource "stackit_intake_runner" "example" {
             project_id = "%s"
             name       = "%s"
-            region     = "eu01"
             max_message_size_kib    = 1024
             max_messages_per_hour   = 1000
         }
@@ -96,7 +94,6 @@ func testAccIntakeRunnerConfigFull(name, description string, maxKib, maxPerHour
                 "created_by" = "terraform-provider-stackit"
                 "env"        = "development"
             }
-            region                  = "eu01"
         }
         `,
 		testutil.ProjectId,
@@ -116,7 +113,6 @@ func testAccIntakeRunnerConfigUpdated(name string, maxKib, maxPerHour int) strin
             max_message_size_kib    = %d
             max_messages_per_hour   = %d
             labels                  = {}
-            region                  = "eu01"
         }
         `,
 		testutil.ProjectId,
@@ -131,9 +127,7 @@ func testAccCheckIntakeRunnerDestroy(s *terraform.State) error {
 	var client *intake.APIClient
 	var err error
 	if testutil.IntakeCustomEndpoint == "" {
-		client, err = intake.NewAPIClient(
-			sdkConfig.WithRegion("eu01"),
-		)
+		client, err = intake.NewAPIClient()
 	} else {
 		client, err = intake.NewAPIClient(sdkConfig.WithEndpoint(testutil.IntakeCustomEndpoint))
 	}
@@ -148,7 +142,12 @@ func testAccCheckIntakeRunnerDestroy(s *terraform.State) error {
 		// Try to find the runner
 		_, err := client.GetIntakeRunner(ctx, rs.Primary.Attributes["project_id"], rs.Primary.Attributes["region"], rs.Primary.Attributes["runner_id"]).Execute()
 		if err == nil {
-			return fmt.Errorf("intake runner with ID %s still exists", rs.Primary.ID)
+			err = client.DeleteIntakeRunner(ctx, rs.Primary.Attributes["project_id"], rs.Primary.Attributes["region"], rs.Primary.Attributes["runner_id"]).Execute()
+			if err != nil {
+				return fmt.Errorf("intake runner with ID %s still existed, got an error removing", rs.Primary.ID, err)
+			}
+
+			return fmt.Errorf("intake runner with ID %s still existed", rs.Primary.ID)
 		}
 		var oapiErr *oapierror.GenericOpenAPIError
 		if !errors.As(err, &oapiErr) || oapiErr.StatusCode != http.StatusNotFound {