feat: Adapt to the new API and adjust some resource schema structures (#76)

* feat: add deploy profile data source and related API functionality

* feat: enhance import state handling for Kafka resources with structured ID format

* feat: add identifier attribute for import state verification in Kafka topic resource tests

* feat: add data bucket profiles data source and related API functionality

* feat: add automq deploy profile data source and update Kafka instance configuration

* feat: improve error handling and logging in Kafka instance operations

* feat: add documentation for automq_data_bucket_profiles data source and update deploy profile example

* feat: update integration types and configurations for Prometheus support

* feat: standardize spacing in automq deploy profile and Kafka instance configurations

* feat: enable PreCheck in Kafka ACL and instance resource tests

* feat: update lifecycle stage from General Availability to Preview in documentation and provider metadata

* feat: update lifecycle stage from General Availability to Preview in documentation and resource templates

* feat: add compatibility note for AutoMQ provider version in documentation

* feat: add deploy profile attribute to integration model and update related documentation

* feat: remove 'prometheus' from integration type options in documentation and provider schema

* feat: remove 'BYOK' option from data encryption mode in Kafka instance documentation and schema

* feat: enhance integration handling by adding support for Set data type and new API methods

* feat: fix integration instance patching and handle empty integrations in Kafka model

* feat: update documentation for automq_data_bucket_profiles and kafka_instance to clarify deployment profile and data bucket details

* feat: add automq_data_bucket_profiles data source and update kafka_instance examples to use it

* feat: update markdown descriptions for encryption modes in Kafka instance documentation

* feat: update documentation to clarify compatibility with AutoMQ control plane versions 7.3.5 and later

* feat: add PreCheck function to resource test cases for improved validation

* feat: skip tests if AUTOMQ_BYOC_ENDPOINT is not set for improved test reliability

* fix: correct spelling of 'Integration' in API methods for consistency

Author: Gezi-lzq

client/api_deploy_profile.go

@@ -0,0 +1,44 @@
+package client
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+)
+
+const (
+	GetDeployProfilePath = "/api/v1/profiles/%s"
+	GetBucketProfilePath = "/api/v1/deploy-profiles/%s/data-bucket-profiles"
+)
+
+// GetDeployProfile retrieves a deployment profile by name
+func (c *Client) GetDeployProfile(ctx context.Context, name string) (*DeployProfileVO, error) {
+	data, err := c.Get(ctx, fmt.Sprintf(GetDeployProfilePath, name), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var profile DeployProfileVO
+	err = json.Unmarshal(data, &profile)
+	if err != nil {
+		return nil, fmt.Errorf("get deploy profile error: %s \nmaybe the profile does not exist", string(data))
+	}
+
+	return &profile, nil
+}
+
+// GetBucketProfile retrieves a bucket profile by name
+func (c *Client) GetBucketProfiles(ctx context.Context, name string) (*PageNumResultBucketProfileVO, error) {
+	data, err := c.Get(ctx, fmt.Sprintf(GetBucketProfilePath, name), nil)
+	if err != nil {
+		return nil, err
+	}
+
+	var profiles PageNumResultBucketProfileVO
+	err = json.Unmarshal(data, &profiles)
+	if err != nil {
+		return nil, fmt.Errorf("error unmarshaling bucket profile response: %v", err)
+	}
+
+	return &profiles, nil
+}

client/api_intergation.go

@@ -7,13 +7,14 @@ import (
 )
 
 const (
-	IntegrationPath              = "/api/v1/integrations"
-	GetIntegrationPath           = "/api/v1/integrations/%s"
-	PatchIntegrationPath         = "/api/v1/integrations/%s"
-	ListInstanceIntegrationsPath = "/api/v1/instances/%s/integrations"
+	IntegrationPath               = "/api/v1/integrations"
+	GetIntegrationPath            = "/api/v1/integrations/%s"
+	PatchIntegrationPath          = "/api/v1/integrations/%s"
+	InstanceIntegrationPath       = "/api/v1/instances/%s/integrations"
+	RemoveInstanceIntergationPath = "/api/v1/instances/%s/integrations/%s"
 )
 
-func (c *Client) CreateIntergration(ctx context.Context, param IntegrationParam) (*IntegrationVO, error) {
+func (c *Client) CreateIntegration(ctx context.Context, param IntegrationParam) (*IntegrationVO, error) {
 	body, err := c.Post(ctx, IntegrationPath, param)
 	if err != nil {
 		return nil, err
@@ -55,6 +56,22 @@ func (c *Client) UpdateIntergration(ctx context.Context, integrationId string, p
 	return &integration, nil
 }
 
+func (c *Client) AddInstanceIntergation(ctx context.Context, instanceId string, param *IntegrationInstanceAddParam) error {
+	_, err := c.Patch(ctx, fmt.Sprintf(InstanceIntegrationPath, instanceId), param)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *Client) RemoveInstanceIntergation(ctx context.Context, instanceId string, integrationId string) error {
+	_, err := c.Delete(ctx, fmt.Sprintf(RemoveInstanceIntergationPath, instanceId, integrationId))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
 func (c *Client) DeleteIntergration(ctx context.Context, integrationId string) error {
 	_, err := c.Delete(ctx, fmt.Sprintf(PatchIntegrationPath, integrationId))
 	if err != nil {
@@ -64,7 +81,7 @@ func (c *Client) DeleteIntergration(ctx context.Context, integrationId string) e
 }
 
 func (c *Client) ListInstanceIntegrations(ctx context.Context, instanceId string) ([]IntegrationVO, error) {
-	body, err := c.Get(ctx, fmt.Sprintf(ListInstanceIntegrationsPath, instanceId), nil)
+	body, err := c.Get(ctx, fmt.Sprintf(InstanceIntegrationPath, instanceId), nil)
 	if err != nil {
 		return nil, err
 	}

client/api_kafka_instance.go

@@ -17,49 +17,51 @@ const (
 	UpdateInstanceBasicInfoPath    = "/api/v1/instances/%s/basic"
 	UpdateInstanceVersionPath      = "/api/v1/instances/%s/versions/%s"
 	UpdateInstanceComputeSpecsPath = "/api/v1/instances/%s/spec"
+	UpdateInstancePath             = "/api/v1/instances/%s"
+	UpdateInstanceCertificatePath  = "/api/v1/instances/%s/certificate"
 )
 
-func (c *Client) CreateKafkaInstance(ctx context.Context, kafka KafkaInstanceRequest) (*KafkaInstanceResponse, error) {
+func (c *Client) CreateKafkaInstance(ctx context.Context, kafka InstanceCreateParam) (*InstanceSummaryVO, error) {
 	body, err := c.Post(ctx, InstancePath, kafka)
 	if err != nil {
 		return nil, err
 	}
-	newkafka := KafkaInstanceResponse{}
+	newkafka := InstanceSummaryVO{}
 	err = json.Unmarshal(body, &newkafka)
 	if err != nil {
 		return nil, err
 	}
 	return &newkafka, nil
 }
 
-func (c *Client) GetKafkaInstance(ctx context.Context, instanceId string) (*KafkaInstanceResponse, error) {
+func (c *Client) GetKafkaInstance(ctx context.Context, instanceId string) (*InstanceVO, error) {
 	body, err := c.Get(ctx, fmt.Sprintf(GetInstancePath, instanceId), nil)
 	if err != nil {
 		return nil, err
 	}
-	instance := KafkaInstanceResponse{}
+	instance := InstanceVO{}
 	err = json.Unmarshal(body, &instance)
 	if err != nil {
 		return nil, err
 	}
 	return &instance, nil
 }
 
-func (c *Client) GetKafkaInstanceByName(ctx context.Context, name string) (*KafkaInstanceResponse, error) {
+func (c *Client) GetKafkaInstanceByName(ctx context.Context, name string) (*InstanceVO, error) {
 	queryParams := make(map[string]string)
 	queryParams["keyword"] = name
 	body, err := c.Get(ctx, InstancePath, queryParams)
 	if err != nil {
 		return nil, err
 	}
-	instances := KafkaInstanceResponseList{}
+	instances := PageNumResultInstanceVO{}
 	err = json.Unmarshal(body, &instances)
 	if err != nil {
 		return nil, err
 	}
 	if len(instances.List) > 0 {
 		for _, item := range instances.List {
-			if item.DisplayName == name {
+			if *item.Name == name {
 				return &item, nil
 			}
 		}
@@ -131,27 +133,31 @@ func (c *Client) UpdateKafkaInstanceVersion(ctx context.Context, instanceId stri
 	return nil
 }
 
-func (c *Client) UpdateKafkaInstanceBasicInfo(ctx context.Context, instanceId string, updateParam InstanceBasicParam) (*KafkaInstanceResponse, error) {
+func (c *Client) UpdateKafkaInstanceBasicInfo(ctx context.Context, instanceId string, updateParam InstanceBasicParam) error {
 	return c.updateInstance(ctx, instanceId, updateParam, UpdateInstanceBasicInfoPath)
 }
 
-func (c *Client) UpdateKafkaInstanceConfig(ctx context.Context, instanceId string, updateParam InstanceConfigParam) (*KafkaInstanceResponse, error) {
+func (c *Client) UpdateKafkaInstanceConfig(ctx context.Context, instanceId string, updateParam InstanceConfigParam) error {
 	return c.updateInstance(ctx, instanceId, updateParam, InstanceConfigPath)
 }
 
-func (c *Client) UpdateKafkaInstanceComputeSpecs(ctx context.Context, instanceId string, updateParam SpecificationUpdateParam) (*KafkaInstanceResponse, error) {
-	return c.updateInstance(ctx, instanceId, updateParam, UpdateInstanceComputeSpecsPath)
+func (c *Client) UpdateKafkaInstanceComputeSpecs(ctx context.Context, instanceId string, updateParam InstanceUpdateParam) error {
+	return c.updateInstance(ctx, instanceId, updateParam, UpdateInstancePath)
 }
 
-func (c *Client) updateInstance(ctx context.Context, instanceId string, updateParam interface{}, path string) (*KafkaInstanceResponse, error) {
-	body, err := c.Patch(ctx, fmt.Sprintf(path, instanceId), updateParam)
+func (c *Client) UpdateKafkaInstanceCertificate(ctx context.Context, instanceId string, updateParam InstanceCertificateParam) error {
+	_, err := c.Put(ctx, fmt.Sprintf(UpdateInstanceCertificatePath, instanceId), updateParam)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	instance := KafkaInstanceResponse{}
-	err = json.Unmarshal(body, &instance)
+	return nil
+}
+
+func (c *Client) updateInstance(ctx context.Context, instanceId string, updateParam interface{}, path string) error {
+	_, err := c.Patch(ctx, fmt.Sprintf(path, instanceId), updateParam)
 	if err != nil {
-		return nil, err
+		return err
 	}
-	return &instance, nil
+
+	return nil
 }

client/client.go

@@ -18,6 +18,8 @@ type Client struct {
 	Token       string
 	Credentials AuthCredentials
 	Signer      *signer.Signer
+	MaxRetries  int
+	RetryDelay  time.Duration
 }
 
 type EnvironmentID string
@@ -67,17 +69,44 @@ func (e *ErrorResponse) Error() string {
 
 func NewClient(ctx context.Context, host string, credentials AuthCredentials) (*Client, error) {
 	c := &Client{
-		HTTPClient:  &http.Client{Timeout: 0 * time.Second},
+		HTTPClient: &http.Client{
+			Timeout: 30 * time.Second,
+		},
 		HostURL:     host,
 		Credentials: credentials,
 		Signer: signer.NewSigner(signer.Credentials{
 			AccessKeyID:     credentials.AccessKeyID,
 			SecretAccessKey: credentials.SecretAccessKey,
 		}),
+		MaxRetries: 3,
+		RetryDelay: 500 * time.Millisecond,
 	}
 	return c, nil
 }
 
+func (c *Client) retryOperation(operation func() ([]byte, error)) ([]byte, error) {
+	var lastErr error
+	for i := 0; i <= c.MaxRetries; i++ {
+		if i > 0 {
+			time.Sleep(c.RetryDelay)
+		}
+
+		result, err := operation()
+		if err == nil {
+			return result, nil
+		}
+
+		lastErr = err
+		// only retry on server errors (5xx) or network errors
+		if e, ok := err.(*ErrorResponse); ok {
+			if e.Code < 500 && e.Code != 0 {
+				return nil, err
+			}
+		}
+	}
+	return nil, fmt.Errorf("after %d retries: %v", c.MaxRetries, lastErr)
+}
+
 func (c *Client) Post(ctx context.Context, path string, body interface{}) ([]byte, error) {
 	b, err := json.Marshal(body)
 	if err != nil {
@@ -90,7 +119,11 @@ func (c *Client) Get(ctx context.Context, path string, queryParams map[string]st
 	if queryParams != nil {
 		path += "?" + buildQueryParams(queryParams)
 	}
-	return c.doRequest(ctx, "GET", path, nil)
+
+	operation := func() ([]byte, error) {
+		return c.doRequest(ctx, "GET", path, nil)
+	}
+	return c.retryOperation(operation)
 }
 
 func (c *Client) Delete(ctx context.Context, path string) ([]byte, error) {

client/model_deploy_profile.go

@@ -0,0 +1,50 @@
+package client
+
+import "time"
+
+// DeployProfileVO represents the response structure for a deployment profile
+type DeployProfileVO struct {
+	Name             *string                `json:"name,omitempty"`
+	Provider         *string                `json:"provider,omitempty"`
+	Region           *string                `json:"region,omitempty"`
+	Vpc              *string                `json:"vpc,omitempty"`
+	InstancePlatform *string                `json:"instancePlatform,omitempty"`
+	CredentialType   *string                `json:"credentialType,omitempty"`
+	ClusterId        *string                `json:"clusterId,omitempty"`
+	GmtCreate        *time.Time             `json:"gmtCreate,omitempty"`
+	GmtModified      *time.Time             `json:"gmtModified,omitempty"`
+	Available        *bool                  `json:"available,omitempty"`
+	System           *bool                  `json:"system,omitempty"`
+	KubeConfig       *string                `json:"kubeConfig,omitempty"`
+	OpsBucket        *BucketProfileDetailVO `json:"opsBucket,omitempty"`
+	DnsZone          *string                `json:"dnsZone,omitempty"`
+	InstanceProfile  *string                `json:"instanceProfile,omitempty"`
+	CredentialId     *string                `json:"credentialId,omitempty"`
+}
+
+// BucketProfileVO
+type PageNumResultBucketProfileVO struct {
+	PageNum   *int32            `json:"pageNum,omitempty"`
+	PageSize  *int32            `json:"pageSize,omitempty"`
+	Total     *int64            `json:"total,omitempty"`
+	List      []BucketProfileVO `json:"list,omitempty"`
+	TotalPage *int64            `json:"totalPage,omitempty"`
+}
+
+// BucketProfileVO struct for BucketProfileVO
+type BucketProfileVO struct {
+	Id          *string    `json:"id,omitempty"`
+	BucketName  *string    `json:"bucketName,omitempty"`
+	GmtCreate   *time.Time `json:"gmtCreate,omitempty"`
+	GmtModified *time.Time `json:"gmtModified,omitempty"`
+}
+
+// BucketProfileDetailVO represents the response structure for a bucket profile
+type BucketProfileDetailVO struct {
+	Id          *string    `json:"id,omitempty"`
+	BucketName  *string    `json:"bucketName,omitempty"`
+	GmtCreate   *time.Time `json:"gmtCreate,omitempty"`
+	GmtModified *time.Time `json:"gmtModified,omitempty"`
+	Provider    *string    `json:"provider,omitempty"`
+	Region      *string    `json:"region,omitempty"`
+}

client/model_integration.go

@@ -9,6 +9,7 @@ type IntegrationVO struct {
 	Type        string                 `json:"type,omitempty"`
 	Code        string                 `json:"code,omitempty"`
 	Name        string                 `json:"name,omitempty"`
+	Profile     string                 `json:"profile,omitempty"`
 	EndPoint    *string                `json:"endPoint,omitempty"`
 	Config      map[string]interface{} `json:"config,omitempty"`
 }
@@ -17,6 +18,7 @@ type IntegrationVO struct {
 type IntegrationParam struct {
 	Type     *string           `json:"type,omitempty"`
 	Name     string            `json:"name" validate:"regexp=^[a-zA-Z\\\\u4e00-\\\\u9fa5][a-z0-9A-Z\\\\u4e00-\\\\u9fa5_\\\\s-]*$"`
+	Profile  string            `json:"profile"`
 	EndPoint string            `json:"endPoint"`
 	Config   []ConfigItemParam `json:"config,omitempty"`
 }