From 0fe89f6deff2845b6b30034553cfc5f80f8ffe6f Mon Sep 17 00:00:00 2001
From: Ivan Savciuc <ivan.savciuc@aiven.io>
Date: Thu, 14 Sep 2023 16:35:26 +0300
Subject: [PATCH] feat(kafkatopic): creation simplification

---
 .../service/kafkatopic/kafka_topic.go         | 20 ++----
 .../service/kafkatopic/kafka_topic_create.go  | 65 -------------------
 2 files changed, 7 insertions(+), 78 deletions(-)
 delete mode 100644 internal/sdkprovider/service/kafkatopic/kafka_topic_create.go

diff --git a/internal/sdkprovider/service/kafkatopic/kafka_topic.go b/internal/sdkprovider/service/kafkatopic/kafka_topic.go
index 3698f451c..d1ade89cb 100644
--- a/internal/sdkprovider/service/kafkatopic/kafka_topic.go
+++ b/internal/sdkprovider/service/kafkatopic/kafka_topic.go
@@ -289,19 +289,13 @@ func resourceKafkaTopicCreate(ctx context.Context, d *schema.ResourceData, m int
 		Tags:        getTags(d),
 	}
 
-	w := &kafkaTopicCreateWaiter{
-		Client:        m.(*aiven.Client),
-		Project:       project,
-		ServiceName:   serviceName,
-		CreateRequest: createRequest,
-	}
-
-	timeout := d.Timeout(schema.TimeoutCreate)
-
-	// nolint:staticcheck // TODO: Migrate to helper/retry package to avoid deprecated WaitForStateContext.
-	_, err = w.Conf(timeout).WaitForStateContext(ctx)
-	if err != nil {
-		return diag.FromErr(err)
+	err = m.(*aiven.Client).KafkaTopics.Create(
+		project,
+		serviceName,
+		createRequest,
+	)
+	if err != nil && !aiven.IsAlreadyExists(err) {
+		diag.FromErr(err)
 	}
 
 	d.SetId(schemautil.BuildResourceID(project, serviceName, topicName))
diff --git a/internal/sdkprovider/service/kafkatopic/kafka_topic_create.go b/internal/sdkprovider/service/kafkatopic/kafka_topic_create.go
deleted file mode 100644
index 21f21e71b..000000000
--- a/internal/sdkprovider/service/kafkatopic/kafka_topic_create.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package kafkatopic
-
-import (
-	"log"
-	"time"
-
-	"github.com/aiven/aiven-go-client"
-	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
-)
-
-// kafkaTopicCreateWaiter is used to create topics. Since topics are often
-// created right after Kafka service is created there may be temporary issues
-// that prevent creating the topics like all brokers not being online. This
-// allows retrying the operation until failing it.
-type kafkaTopicCreateWaiter struct {
-	Client        *aiven.Client
-	Project       string
-	ServiceName   string
-	CreateRequest aiven.CreateKafkaTopicRequest
-}
-
-// RefreshFunc will call the Aiven client and refresh it's state.
-// nolint:staticcheck // TODO: Migrate to helper/retry package to avoid deprecated resource.StateRefreshFunc.
-func (w *kafkaTopicCreateWaiter) RefreshFunc() resource.StateRefreshFunc {
-	// Should check if topic does not exist before create
-	// Assumes it exists, should prove it doesn't by getting no error
-	return func() (interface{}, string, error) {
-		err := w.Client.KafkaTopics.Create(
-			w.Project,
-			w.ServiceName,
-			w.CreateRequest,
-		)
-
-		if err != nil {
-			// If some brokers are offline while the request is being executed
-			// the operation may fail.
-			aivenError, ok := err.(aiven.Error)
-			if !ok {
-				return nil, "", err
-			}
-
-			if !aiven.IsAlreadyExists(aivenError) {
-				log.Printf("[DEBUG] Got error %v while waiting for topic to be created.", aivenError)
-				return nil, "CREATING", nil
-			}
-		}
-
-		return w.CreateRequest.TopicName, "CREATED", nil
-	}
-}
-
-// Conf sets up the configuration to refresh.
-// nolint:staticcheck // TODO: Migrate to helper/retry package to avoid deprecated resource.StateRefreshFunc.
-func (w *kafkaTopicCreateWaiter) Conf(timeout time.Duration) *resource.StateChangeConf {
-	log.Printf("[DEBUG] Create waiter timeout %.0f minutes", timeout.Minutes())
-
-	return &resource.StateChangeConf{
-		Pending:    []string{"CREATING"},
-		Target:     []string{"CREATED"},
-		Refresh:    w.RefreshFunc(),
-		Delay:      5 * time.Second,
-		Timeout:    timeout,
-		MinTimeout: 10 * time.Second,
-	}
-}