aliyun · vie-serendipity · Jan 16, 2025
diff --git a/alicloud/provider.go b/alicloud/provider.go
@@ -1037,6 +1037,7 @@ func Provider() terraform.ResourceProvider {
 			"alicloud_arms_environment":                                     resourceAliCloudArmsEnvironment(),
 			"alicloud_hologram_instance":                                    resourceAliCloudHologramInstance(),
 			"alicloud_ack_one_cluster":                                      resourceAliCloudAckOneCluster(),
+			"alicloud_ack_one_membership_attachment":                        resourceAliCloudAckOneMembershipAttachment(),
 			"alicloud_drds_polardbx_instance":                               resourceAliCloudDrdsPolardbxInstance(),
 			"alicloud_gpdb_backup_policy":                                   resourceAliCloudGpdbBackupPolicy(),
 			"alicloud_threat_detection_file_upload_limit":                   resourceAliCloudThreatDetectionFileUploadLimit(),

diff --git a/alicloud/resource_alicloud_ack_one_membership_attachment.go b/alicloud/resource_alicloud_ack_one_membership_attachment.go
@@ -0,0 +1,159 @@
+package alicloud
+
+import (
+	"log"
+	"time"
+
+	util "github.com/alibabacloud-go/tea-utils/service"
+	"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
+)
+
+func resourceAliCloudAckOneMembershipAttachment() *schema.Resource {
+	return &schema.Resource{
+		Schema: map[string]*schema.Schema{
+			"cluster_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "ID of the ACK One fleet cluster",
+			},
+			"sub_cluster_id": {
+				Type:        schema.TypeString,
+				Required:    true,
+				ForceNew:    true,
+				Description: "ID of the ACK cluster that needs to be managed by ACK One fleet",
+			},
+		},
+		Timeouts: &schema.ResourceTimeout{
+			Create: schema.DefaultTimeout(25 * time.Minute),
+			Delete: schema.DefaultTimeout(25 * time.Minute),
+		},
+		Create: resourceAliCloudAckOneMembershipAttachmentCreate,
+		Read:   resourceAliCloudAckOneMembershipAttachmentRead,
+		Delete: resourceAliCloudAckOneMembershipAttachmentDelete,
+		Importer: &schema.ResourceImporter{
+			State: schema.ImportStatePassthrough,
+		},
+	}
+}
+
+func resourceAliCloudAckOneMembershipAttachmentCreate(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*connectivity.AliyunClient)
+
+	action := "AttachClusterToHub"
+	var request map[string]interface{}
+	var response map[string]interface{}
+	conn, err := client.NewAckoneClient()
+	if err != nil {
+		return WrapError(err)
+	}
+	request = make(map[string]interface{})
+	clusterId := d.Get("cluster_id").(string)
+	subClusterId := d.Get("sub_cluster_id").(string)
+	resourceId := clusterId + ":" + subClusterId
+	request["ClusterId"] = clusterId
+	request["ClusterIds"] = "[\"" + subClusterId + "\"]"
+
+	runtime := util.RuntimeOptions{}
+	runtime.SetAutoretry(true)
+	wait := incrementalWait(3*time.Second, 5*time.Second)
+	err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
+		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2022-01-01"), StringPointer("AK"), nil, request, &runtime)
+
+		if err != nil {
+			if NeedRetry(err) {
+				wait()
+				return resource.RetryableError(err)
+			}
+			return resource.NonRetryableError(err)
+		}
+		return nil
+	})
+	addDebug(action, response, request)
+
+	if err != nil {
+		return WrapErrorf(err, DefaultErrorMsg, "alicloud_ack_one_membership_attachment", action, AlibabaCloudSdkGoERROR)
+	}
+
+	ackOneServiceV2 := AckOneServiceV2{client}
+	stateConf := BuildStateConf([]string{}, []string{"running"}, d.Timeout(schema.TimeoutCreate), 5*time.Second, ackOneServiceV2.AckOneClusterStateRefreshFunc(clusterId, "$.ClusterInfo.State", []string{}))
+	if _, err := stateConf.WaitForState(); err != nil {
+		return WrapErrorf(err, IdMsg, resourceId)
+	}
+
+	_, err = ackOneServiceV2.DescribeAckOneMembershipAttachment(resourceId)
+	if err != nil {
+		return WrapErrorf(err, DefaultErrorMsg, "alicloud_ack_one_membership_attachment", action, AlibabaCloudSdkGoERROR)
+	}
+
+	d.SetId(resourceId)
+	return nil
+}
+
+func resourceAliCloudAckOneMembershipAttachmentRead(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*connectivity.AliyunClient)
+	ackOneServiceV2 := AckOneServiceV2{client}
+
+	objectRaw, err := ackOneServiceV2.DescribeAckOneMembershipAttachment(d.Id())
+	if err != nil {
+		if !d.IsNewResource() && NotFoundError(err) {
+			log.Printf("[DEBUG] Resource alicloud_ack_one_membership_attachment DescribeAckOneMembershipAttachment Failed!!! %s", err)
+			d.SetId("")
+			return nil
+		}
+		return WrapError(err)
+	}
+
+	d.Set("cluster_id", objectRaw["cluster_id"])
+	d.Set("sub_cluster_id", objectRaw["sub_cluster_id"])
+	return nil
+}
+
+func resourceAliCloudAckOneMembershipAttachmentDelete(d *schema.ResourceData, meta interface{}) error {
+	client := meta.(*connectivity.AliyunClient)
+	action := "DetachClusterFromHub"
+	var request map[string]interface{}
+	var response map[string]interface{}
+	conn, err := client.NewAckoneClient()
+	if err != nil {
+		return WrapError(err)
+	}
+	request = make(map[string]interface{})
+	clusterId := d.Get("cluster_id").(string)
+	request["ClusterId"] = d.Get("cluster_id")
+	request["ClusterIds"] = "[\"" + d.Get("sub_cluster_id").(string) + "\"]"
+
+	runtime := util.RuntimeOptions{}
+	runtime.SetAutoretry(true)
+	wait := incrementalWait(3*time.Second, 5*time.Second)
+	err = resource.Retry(d.Timeout(schema.TimeoutDelete), func() *resource.RetryError {
+		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2022-01-01"), StringPointer("AK"), nil, request, &runtime)
+
+		if err != nil {
+			if NeedRetry(err) {
+				wait()
+				return resource.RetryableError(err)
+			}
+			return resource.NonRetryableError(err)
+		}
+		return nil
+	})
+	addDebug(action, response, request)
+
+	if err != nil {
+		if NotFoundError(err) {
+			return nil
+		}
+		return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
+	}
+
+	ackOneServiceV2 := AckOneServiceV2{client}
+	stateConf := BuildStateConf([]string{}, []string{"running"}, d.Timeout(schema.TimeoutDelete), 5*time.Second, ackOneServiceV2.AckOneClusterStateRefreshFunc(clusterId, "$.ClusterInfo.State", []string{}))
+	if _, err := stateConf.WaitForState(); err != nil {
+		return WrapErrorf(err, IdMsg, d.Id())
+	}
+
+	return nil
+}
diff --git a/alicloud/resource_alicloud_ack_one_membership_attachment_test.go b/alicloud/resource_alicloud_ack_one_membership_attachment_test.go
@@ -0,0 +1,128 @@
+package alicloud
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
+	"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
+)
+
+func TestAccAliCloudAckOneMembershipAttachment_basic(t *testing.T) {
+	var v map[string]interface{}
+	resourceId := "alicloud_ack_one_membership_attachment.default"
+	ra := resourceAttrInit(resourceId, AliCloudAckOneMembershipAttachmentMap)
+	rc := resourceCheckInitWithDescribeMethod(resourceId, &v, func() interface{} {
+		return &AckOneServiceV2{testAccProvider.Meta().(*connectivity.AliyunClient)}
+	}, "DescribeAckOneMembershipAttachment")
+	rac := resourceAttrCheckInit(rc, ra)
+	testAccCheck := rac.resourceAttrMapUpdateSet()
+	rand := acctest.RandInt()
+	name := fmt.Sprintf("tf-testAccAckOneMembershipAttachment-%d", rand)
+	testAccConfig := resourceTestAccConfigFunc(resourceId, name, AliCloudAckOneMembershipAttachmentBasicDependence0)
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: rac.checkResourceDestroy(),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccConfig(map[string]interface{}{
+					"cluster_id":     "${alicloud_ack_one_cluster.default.id}",
+					"sub_cluster_id": "${alicloud_cs_managed_kubernetes.default.id}",
+				}),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheck(
+						map[string]string{
+							"cluster_id":     CHECKSET,
+							"sub_cluster_id": CHECKSET,
+						},
+					),
+				),
+			},
+			{
+				ResourceName:            resourceId,
+				ImportState:             true,
+				ImportStateVerify:       true,
+				ImportStateVerifyIgnore: []string{},
+			},
+		},
+	})
+}
+
+var AliCloudAckOneMembershipAttachmentMap = map[string]string{
+	"cluster_id":     CHECKSET,
+	"sub_cluster_id": CHECKSET,
+}
+
+func AliCloudAckOneMembershipAttachmentBasicDependence0(name string) string {
+	return fmt.Sprintf(`
+provider "alicloud" {
+  region = "cn-hangzhou"
+}
+
+variable "name" {
+  default = "terraform-example"
+}
+
+variable "key_name" {
+  default = "%s"
+}
+
+data "alicloud_enhanced_nat_available_zones" "enhanced" {
+}
+
+data "alicloud_instance_types" "cloud_efficiency" {
+  availability_zone    = data.alicloud_enhanced_nat_available_zones.enhanced.zones.0.zone_id
+  cpu_core_count       = 4
+  memory_size          = 8
+  kubernetes_node_role = "Worker"
+  system_disk_category = "cloud_efficiency"
+}
+
+resource "alicloud_vpc" "default" {
+  cidr_block = "10.4.0.0/16"
+}
+
+resource "alicloud_vswitch" "default" {
+  cidr_block = "10.4.0.0/24"
+  vpc_id     = alicloud_vpc.default.id
+  zone_id    = data.alicloud_enhanced_nat_available_zones.enhanced.zones.0.zone_id
+}
+
+resource "alicloud_cs_managed_kubernetes" "default" {
+  cluster_spec         = "ack.pro.small"
+  vswitch_ids          = [alicloud_vswitch.default.id]
+  new_nat_gateway      = true
+  pod_cidr             = cidrsubnet("10.0.0.0/8", 8, 36)
+  service_cidr         = cidrsubnet("172.16.0.0/16", 4, 7)
+  slb_internet_enabled = true
+
+  is_enterprise_security_group = true
+}
+
+resource "alicloud_key_pair" "default" {
+  key_pair_name = var.key_name
+}
+
+resource "alicloud_cs_kubernetes_node_pool" "default" {
+  node_pool_name       = var.name
+  cluster_id           = alicloud_cs_managed_kubernetes.default.id
+  vswitch_ids          = [alicloud_vswitch.default.id]
+  instance_types       = [data.alicloud_instance_types.cloud_efficiency.instance_types.0.id]
+  system_disk_category = "cloud_efficiency"
+  system_disk_size     = 40
+  key_name             = alicloud_key_pair.default.key_pair_name
+  desired_size         = 1
+}
+
+resource "alicloud_ack_one_cluster" "default" {
+  depends_on = [alicloud_cs_managed_kubernetes.default]
+  network {
+    vpc_id    = alicloud_vpc.default.id
+    vswitches = [alicloud_vswitch.default.id]
+  }
+  argocd_enabled = false
+}
+`, name)
+}
diff --git a/alicloud/service_alicloud_ack_one_v2.go b/alicloud/service_alicloud_ack_one_v2.go
@@ -2,6 +2,7 @@ package alicloud
 
 import (
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/PaesslerAG/jsonpath"
@@ -44,9 +45,9 @@ func (s *AckOneServiceV2) DescribeAckOneCluster(id string) (object map[string]in
 			}
 			return resource.NonRetryableError(err)
 		}
-		addDebug(action, response, request)
 		return nil
 	})
+	addDebug(action, response, request)
 
 	if err != nil {
 		if IsExpectedErrors(err, []string{"Cluster.NotFound"}) {
@@ -84,4 +85,71 @@ func (s *AckOneServiceV2) AckOneClusterStateRefreshFunc(id string, field string,
 	}
 }
 
+func (s *AckOneServiceV2) DescribeAckOneMembershipAttachment(id string) (object map[string]interface{}, err error) {
+
+	client := s.client
+	var request map[string]interface{}
+	var response map[string]interface{}
+	var query map[string]interface{}
+	action := "DescribeManagedClusters"
+	conn, err := client.NewAckoneClient()
+	if err != nil {
+		return object, WrapError(err)
+	}
+	request = make(map[string]interface{})
+	query = make(map[string]interface{})
+	clusterId := strings.Split(id, ":")[0]
+	subClusterId := strings.Split(id, ":")[1]
+	query["ClusterId"] = clusterId
+
+	runtime := util.RuntimeOptions{}
+	runtime.SetAutoretry(true)
+	wait := incrementalWait(3*time.Second, 3*time.Second)
+	err = resource.Retry(15*time.Minute, func() *resource.RetryError {
+		response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2022-01-01"), StringPointer("AK"), query, request, &runtime)
+
+		if err != nil {
+			if NeedRetry(err) {
+				wait()
+				return resource.RetryableError(err)
+			}
+			return resource.NonRetryableError(err)
+		}
+		clusters := response["Clusters"].([]interface{})
+		if len(clusters) == 0 {
+			return resource.RetryableError(fmt.Errorf("No managed cluster found"))
+		}
+		return nil
+	})
+	addDebug(action, response, request)
+
+	if err != nil {
+		if IsExpectedErrors(err, []string{"Cluster.NotFound"}) {
+			return object, WrapErrorf(Error(GetNotFoundMessage("Cluster", id)), NotFoundMsg, response)
+		}
+		return object, WrapErrorf(err, DefaultErrorMsg, id, action, AlibabaCloudSdkGoERROR)
+	}
+
+	clusters := response["Clusters"].([]interface{})
+
+	found := false
+	for _, cluster := range clusters {
+		managedCluster := cluster.(map[string]interface{})
+		clusterId := managedCluster["Cluster"].(map[string]interface{})["ClusterID"].(string)
+		if clusterId == subClusterId {
+			found = true
+			break
+		}
+	}
+	if !found {
+		return object, WrapErrorf(Error(GetNotFoundMessage("Cluster", id)), NotFoundMsg, response)
+	}
+
+	v := map[string]interface{}{
+		"cluster_id":     clusterId,
+		"sub_cluster_id": subClusterId,
+	}
+	return v, nil
+}
+
 // DescribeAckOneCluster >>> Encapsulated.