Skip to content

Commit

Permalink
resource/alicloud_dfs_access_group: add new attribute create_time; re…
Browse files Browse the repository at this point in the history 
…source/alicloud_dfs_access_rule: add new attribute create_time; resource/alicloud_dfs_file_system: add new attribute create_time, data_redundancy_type, storage_set_name; resource/alicloud_dfs_mount_point add new attribute alias_prefix, create_time; New Resource: alicloud_dfs_vsc_mount_point; resource/alicloud_dfs_mount_point: add new attribute alias_prefix.
  • Loading branch information
@ChenHanZhang
ChenHanZhang committed Mar 4, 2024
1 parent c11f8d2 commit 86a3fdc
Show file tree
Hide file tree
Showing 18 changed files with 2,638 additions and 429 deletions.
24 changes: 24 additions & 0 deletions alicloud/connectivity/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5316,3 +5316,27 @@ func (client *AliyunClient) NewWafv3Client() (*rpc.Client, error) {
}
return conn, nil
}
func (client *AliyunClient) NewDfsClient() (*rpc.Client, error) {
productCode := "alidfs"
endpoint := ""
if v, ok := client.config.Endpoints.Load(productCode); !ok || v.(string) == "" {
if err := client.loadEndpoint(productCode); err != nil {
endpoint = fmt.Sprintf("dfs.%s.aliyuncs.com", client.config.RegionId)
client.config.Endpoints.Store(productCode, endpoint)
log.Printf("[ERROR] loading %s endpoint got an error: %#v. Using the endpoint %s instead.", productCode, err, endpoint)
}
}
if v, ok := client.config.Endpoints.Load(productCode); ok && v.(string) != "" {
endpoint = v.(string)
}
if endpoint == "" {
return nil, fmt.Errorf("[ERROR] missing the product %s endpoint.", productCode)
}
sdkConfig := client.teaSdkConfig
sdkConfig.SetEndpoint(endpoint)
conn, err := rpc.NewClient(&sdkConfig)
if err != nil {
return nil, fmt.Errorf("unable to initialize the %s client: %#v", productCode, err)
}
return conn, nil
}
9 changes: 5 additions & 4 deletions alicloud/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,7 @@ func Provider() terraform.ResourceProvider {
},
ResourcesMap: map[string]*schema.Resource{
"alicloud_wafv3_defense_template": resourceAliCloudWafv3DefenseTemplate(),
"alicloud_dfs_vsc_mount_point": resourceAliCloudDfsVscMountPoint(),
"alicloud_vpc_ipv6_address": resourceAliCloudVpcIpv6Address(),
"alicloud_api_gateway_instance": resourceAliCloudApiGatewayInstance(),
"alicloud_ebs_solution_instance": resourceAliCloudEbsSolutionInstance(),
Expand Down Expand Up @@ -1344,7 +1345,7 @@ func Provider() terraform.ResourceProvider {
"alicloud_security_center_group": resourceAlicloudSecurityCenterGroup(),
"alicloud_alb_acl": resourceAlicloudAlbAcl(),
"alicloud_bastionhost_user": resourceAlicloudBastionhostUser(),
"alicloud_dfs_access_group": resourceAlicloudDfsAccessGroup(),
"alicloud_dfs_access_group": resourceAliCloudDfsAccessGroup(),
"alicloud_ehpc_job_template": resourceAlicloudEhpcJobTemplate(),
"alicloud_sddp_config": resourceAlicloudSddpConfig(),
"alicloud_hbr_restore_job": resourceAlicloudHbrRestoreJob(),
Expand Down Expand Up @@ -1411,11 +1412,11 @@ func Provider() terraform.ResourceProvider {
"alicloud_ecs_deployment_set": resourceAlicloudEcsDeploymentSet(),
"alicloud_cloud_sso_user": resourceAlicloudCloudSsoUser(),
"alicloud_cloud_sso_access_configuration": resourceAlicloudCloudSsoAccessConfiguration(),
"alicloud_dfs_file_system": resourceAlicloudDfsFileSystem(),
"alicloud_dfs_file_system": resourceAliCloudDfsFileSystem(),
"alicloud_vpc_traffic_mirror_filter": resourceAliCloudVpcTrafficMirrorFilter(),
"alicloud_dfs_access_rule": resourceAlicloudDfsAccessRule(),
"alicloud_dfs_access_rule": resourceAliCloudDfsAccessRule(),
"alicloud_vpc_traffic_mirror_filter_egress_rule": resourceAliCloudVpcTrafficMirrorFilterEgressRule(),
"alicloud_dfs_mount_point": resourceAlicloudDfsMountPoint(),
"alicloud_dfs_mount_point": resourceAliCloudDfsMountPoint(),
"alicloud_ecd_simple_office_site": resourceAlicloudEcdSimpleOfficeSite(),
"alicloud_vpc_traffic_mirror_filter_ingress_rule": resourceAliCloudVpcTrafficMirrorFilterIngressRule(),
"alicloud_ecd_nas_file_system": resourceAlicloudEcdNasFileSystem(),
Expand Down
145 changes: 90 additions & 55 deletions alicloud/resource_alicloud_dfs_access_group.go
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// Package alicloud. This file is generated automatically. Please do not modify it manually, thank you!
package alicloud

import (
Expand All @@ -9,166 +10,200 @@ import (
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
"github.com/hashicorp/terraform-plugin-sdk/helper/validation"
)

func resourceAlicloudDfsAccessGroup() *schema.Resource {
func resourceAliCloudDfsAccessGroup() *schema.Resource {
return &schema.Resource{
Create: resourceAlicloudDfsAccessGroupCreate,
Read: resourceAlicloudDfsAccessGroupRead,
Update: resourceAlicloudDfsAccessGroupUpdate,
Delete: resourceAlicloudDfsAccessGroupDelete,
Create: resourceAliCloudDfsAccessGroupCreate,
Read: resourceAliCloudDfsAccessGroupRead,
Update: resourceAliCloudDfsAccessGroupUpdate,
Delete: resourceAliCloudDfsAccessGroupDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Timeouts: &schema.ResourceTimeout{
Create: schema.DefaultTimeout(5 * time.Minute),
Update: schema.DefaultTimeout(5 * time.Minute),
Delete: schema.DefaultTimeout(5 * time.Minute),
},
Schema: map[string]*schema.Schema{
"access_group_name": {
Type: schema.TypeString,
Required: true,
ValidateFunc: validation.StringLenBetween(1, 100),
Type: schema.TypeString,
Required: true,
},
"create_time": {
Type: schema.TypeString,
Computed: true,
},
"description": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringLenBetween(1, 100),
Type: schema.TypeString,
Optional: true,
},
"network_type": {
Type: schema.TypeString,
Required: true,
ForceNew: true,
ValidateFunc: validation.StringInSlice([]string{"VPC"}, false),
ValidateFunc: StringInSlice([]string{"VPC"}, true),
},
},
}
}

func resourceAlicloudDfsAccessGroupCreate(d *schema.ResourceData, meta interface{}) error {
func resourceAliCloudDfsAccessGroupCreate(d *schema.ResourceData, meta interface{}) error {

client := meta.(*connectivity.AliyunClient)
var response map[string]interface{}

action := "CreateAccessGroup"
request := make(map[string]interface{})
conn, err := client.NewAlidfsClient()
var request map[string]interface{}
var response map[string]interface{}
query := make(map[string]interface{})
conn, err := client.NewDfsClient()
if err != nil {
return WrapError(err)
}
request = make(map[string]interface{})

request["AccessGroupName"] = d.Get("access_group_name")
request["NetworkType"] = d.Get("network_type")
if v, ok := d.GetOk("description"); ok {
request["Description"] = v
}
request["NetworkType"] = d.Get("network_type")
request["InputRegionId"] = client.RegionId
wait := incrementalWait(3*time.Second, 3*time.Second)
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("2018-06-20"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2018-06-20"), StringPointer("AK"), query, request, &runtime)

if err != nil {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)

if err != nil {
return WrapErrorf(err, DefaultErrorMsg, "alicloud_dfs_access_group", action, AlibabaCloudSdkGoERROR)
}

d.SetId(fmt.Sprint(response["AccessGroupId"]))

return resourceAlicloudDfsAccessGroupRead(d, meta)
return resourceAliCloudDfsAccessGroupRead(d, meta)
}
func resourceAlicloudDfsAccessGroupRead(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudDfsAccessGroupRead(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
dfsService := DfsService{client}
object, err := dfsService.DescribeDfsAccessGroup(d.Id())
dfsServiceV2 := DfsServiceV2{client}

objectRaw, err := dfsServiceV2.DescribeDfsAccessGroup(d.Id())
if err != nil {
if NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_dfs_access_group dfsService.DescribeDfsAccessGroup Failed!!! %s", err)
if !d.IsNewResource() && NotFoundError(err) {
log.Printf("[DEBUG] Resource alicloud_dfs_access_group DescribeDfsAccessGroup Failed!!! %s", err)
d.SetId("")
return nil
}
return WrapError(err)
}
d.Set("access_group_name", object["AccessGroupName"])
d.Set("description", object["Description"])
d.Set("network_type", object["NetworkType"])

d.Set("access_group_name", objectRaw["AccessGroupName"])
d.Set("create_time", objectRaw["CreateTime"])
d.Set("description", objectRaw["Description"])
d.Set("network_type", objectRaw["NetworkType"])

return nil
}
func resourceAlicloudDfsAccessGroupUpdate(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudDfsAccessGroupUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
conn, err := client.NewAlidfsClient()
if err != nil {
return WrapError(err)
}
var request map[string]interface{}
var response map[string]interface{}
var query map[string]interface{}
update := false
request := map[string]interface{}{
"AccessGroupId": d.Id(),
action := "ModifyAccessGroup"
conn, err := client.NewDfsClient()
if err != nil {
return WrapError(err)
}
request = make(map[string]interface{})
query = make(map[string]interface{})
query["AccessGroupId"] = d.Id()
request["InputRegionId"] = client.RegionId
if d.HasChange("access_group_name") {
update = true
request["AccessGroupName"] = d.Get("access_group_name")
}
request["AccessGroupName"] = d.Get("access_group_name")
if d.HasChange("description") {
update = true
if v, ok := d.GetOk("description"); ok {
request["Description"] = v
}
request["Description"] = d.Get("description")
}

if update {
action := "ModifyAccessGroup"
wait := incrementalWait(3*time.Second, 3*time.Second)
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2018-06-20"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2018-06-20"), StringPointer("AK"), query, request, &runtime)

if err != nil {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)
if err != nil {
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}
}
return resourceAlicloudDfsAccessGroupRead(d, meta)

return resourceAliCloudDfsAccessGroupRead(d, meta)
}
func resourceAlicloudDfsAccessGroupDelete(d *schema.ResourceData, meta interface{}) error {

func resourceAliCloudDfsAccessGroupDelete(d *schema.ResourceData, meta interface{}) error {

client := meta.(*connectivity.AliyunClient)
action := "DeleteAccessGroup"
var request map[string]interface{}
var response map[string]interface{}
conn, err := client.NewAlidfsClient()
query := make(map[string]interface{})
conn, err := client.NewDfsClient()
if err != nil {
return WrapError(err)
}
request := map[string]interface{}{
"AccessGroupId": d.Id(),
}

request = make(map[string]interface{})
query["AccessGroupId"] = d.Id()
request["InputRegionId"] = client.RegionId
wait := incrementalWait(3*time.Second, 3*time.Second)

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("2018-06-20"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2018-06-20"), StringPointer("AK"), query, request, &runtime)

if err != nil {
if NeedRetry(err) {
wait()
return resource.RetryableError(err)
}
return resource.NonRetryableError(err)
}
addDebug(action, response, request)
return nil
})
addDebug(action, response, request)

if err != nil {
if IsExpectedErrors(err, []string{"InvalidParameter.AccessGroupNotFound"}) {
return nil
}
return WrapErrorf(err, DefaultErrorMsg, d.Id(), action, AlibabaCloudSdkGoERROR)
}

return nil
}

0 comments on commit 86a3fdc

Please sign in to comment.