Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IMS: Improves the invoking api method and supports refreshing credential automatically #8229

Merged
merged 1 commit into from
Feb 3, 2025
Merged

IMS: Improves the invoking api method and supports refreshing credential automatically #8229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions alicloud/data_source_alicloud_ram_saml_providers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"time"

"github.com/PaesslerAG/jsonpath"
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"
Expand Down Expand Up @@ -106,16 +105,11 @@ func dataSourceAlicloudRamSamlProvidersRead(d *schema.ResourceData, meta interfa
}
}
var response map[string]interface{}
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error
for {
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err := resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutRead)), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down
34 changes: 8 additions & 26 deletions alicloud/resource_alicloud_ims_oidc_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
"time"

"github.com/PaesslerAG/jsonpath"
util "github.com/alibabacloud-go/tea-utils/service"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/blues/jsonata-go"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
Expand Down Expand Up @@ -78,10 +77,7 @@ func resourceAliCloudImsOidcProviderCreate(d *schema.ResourceData, meta interfac
action := "CreateOIDCProvider"
var request map[string]interface{}
var response map[string]interface{}
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error
request = make(map[string]interface{})
request["OIDCProviderName"] = d.Get("oidc_provider_name")

Expand All @@ -100,7 +96,7 @@ func resourceAliCloudImsOidcProviderCreate(d *schema.ResourceData, meta interfac
}
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("2019-08-15"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, false)

if err != nil {
if NeedRetry(err) {
Expand Down Expand Up @@ -160,10 +156,7 @@ func resourceAliCloudImsOidcProviderUpdate(d *schema.ResourceData, meta interfac
var response map[string]interface{}
update := false
action := "UpdateOIDCProvider"
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error
request = make(map[string]interface{})
request["OIDCProviderName"] = d.Id()
if !d.IsNewResource() && d.HasChange("description") {
Expand All @@ -184,7 +177,7 @@ func resourceAliCloudImsOidcProviderUpdate(d *schema.ResourceData, meta interfac
if update {
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("2019-08-15"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, false)

if err != nil {
if NeedRetry(err) {
Expand Down Expand Up @@ -213,10 +206,6 @@ func resourceAliCloudImsOidcProviderUpdate(d *schema.ResourceData, meta interfac

for _, item := range fingerprints {
action := "AddFingerprintToOIDCProvider"
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
request = make(map[string]interface{})
request["OIDCProviderName"] = d.Id()
if v, ok := item.(string); ok {
Expand All @@ -228,7 +217,7 @@ func resourceAliCloudImsOidcProviderUpdate(d *schema.ResourceData, meta interfac
}
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("2019-08-15"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, false)

if err != nil {
if NeedRetry(err) {
Expand All @@ -253,10 +242,6 @@ func resourceAliCloudImsOidcProviderUpdate(d *schema.ResourceData, meta interfac

for _, item := range fingerprints {
action := "RemoveFingerprintFromOIDCProvider"
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
request = make(map[string]interface{})
request["OIDCProviderName"] = d.Id()
if v, ok := item.(string); ok {
Expand All @@ -268,7 +253,7 @@ func resourceAliCloudImsOidcProviderUpdate(d *schema.ResourceData, meta interfac
}
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("2019-08-15"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, false)

if err != nil {
if NeedRetry(err) {
Expand Down Expand Up @@ -298,16 +283,13 @@ func resourceAliCloudImsOidcProviderDelete(d *schema.ResourceData, meta interfac
action := "DeleteOIDCProvider"
var request map[string]interface{}
var response map[string]interface{}
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error
request = make(map[string]interface{})
request["OIDCProviderName"] = d.Id()

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("2019-08-15"), StringPointer("AK"), nil, request, &util.RuntimeOptions{})
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, false)

if err != nil {
if NeedRetry(err) {
Expand Down
29 changes: 6 additions & 23 deletions alicloud/resource_alicloud_ram_saml_provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"time"

"github.com/PaesslerAG/jsonpath"
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"
Expand Down Expand Up @@ -55,10 +54,7 @@ func resourceAliCloudRamSamlProviderCreate(d *schema.ResourceData, meta interfac
var response map[string]interface{}
action := "CreateSAMLProvider"
request := make(map[string]interface{})
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error

request["SAMLProviderName"] = d.Get("saml_provider_name")
request["EncodedSAMLMetadataDocument"] = d.Get("encodedsaml_metadata_document")
Expand All @@ -67,11 +63,9 @@ func resourceAliCloudRamSamlProviderCreate(d *schema.ResourceData, meta interfac
request["Description"] = v
}

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutCreate)), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down Expand Up @@ -123,6 +117,7 @@ func resourceAliCloudRamSamlProviderRead(d *schema.ResourceData, meta interface{
func resourceAliCloudRamSamlProviderUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
var response map[string]interface{}
var err error
update := false

request := map[string]interface{}{
Expand All @@ -143,16 +138,9 @@ func resourceAliCloudRamSamlProviderUpdate(d *schema.ResourceData, meta interfac

if update {
action := "UpdateSAMLProvider"
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutUpdate)), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand All @@ -176,20 +164,15 @@ func resourceAliCloudRamSamlProviderDelete(d *schema.ResourceData, meta interfac
client := meta.(*connectivity.AliyunClient)
action := "DeleteSAMLProvider"
var response map[string]interface{}
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error

request := map[string]interface{}{
"SAMLProviderName": d.Id(),
}

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(client.GetRetryTimeout(d.Timeout(schema.TimeoutDelete)), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down
19 changes: 4 additions & 15 deletions alicloud/resource_alicloud_ram_security_preference.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ 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"
Expand Down Expand Up @@ -63,10 +62,7 @@ func resourceAlicloudRamSecurityPreferenceCreate(d *schema.ResourceData, meta in
var response map[string]interface{}
action := "SetSecurityPreference"
request := make(map[string]interface{})
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error
if v, ok := d.GetOkExists("allow_user_to_change_password"); ok {
request["AllowUserToChangePassword"] = v
}
Expand All @@ -89,11 +85,9 @@ func resourceAlicloudRamSecurityPreferenceCreate(d *schema.ResourceData, meta in
request["EnforceMFAForLogin"] = v
}

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutCreate), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down Expand Up @@ -143,10 +137,7 @@ func resourceAlicloudRamSecurityPreferenceRead(d *schema.ResourceData, meta inte
}
func resourceAlicloudRamSecurityPreferenceUpdate(d *schema.ResourceData, meta interface{}) error {
client := meta.(*connectivity.AliyunClient)
conn, err := client.NewImsClient()
if err != nil {
return WrapError(err)
}
var err error
var response map[string]interface{}
update := false
request := map[string]interface{}{}
Expand Down Expand Up @@ -188,11 +179,9 @@ func resourceAlicloudRamSecurityPreferenceUpdate(d *schema.ResourceData, meta in
if update {
action := "SetSecurityPreference"

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(d.Timeout(schema.TimeoutUpdate), func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down
13 changes: 2 additions & 11 deletions alicloud/service_alicloud_ims.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"time"

"github.com/PaesslerAG/jsonpath"
util "github.com/alibabacloud-go/tea-utils/service"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
)
Expand All @@ -17,21 +16,13 @@ type ImsService struct {
func (s *ImsService) DescribeRamSamlProvider(id string) (object map[string]interface{}, err error) {
var response map[string]interface{}
action := "GetSAMLProvider"

conn, err := s.client.NewImsClient()
if err != nil {
return nil, WrapError(err)
}

client := s.client
request := map[string]interface{}{
"SAMLProviderName": id,
}

runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down
7 changes: 1 addition & 6 deletions alicloud/service_alicloud_ims_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"time"

"github.com/PaesslerAG/jsonpath"
util "github.com/alibabacloud-go/tea-utils/service"
"github.com/aliyun/terraform-provider-alicloud/alicloud/connectivity"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"
)
Expand All @@ -23,17 +22,13 @@ func (s *ImsServiceV2) DescribeImsOidcProvider(id string) (object map[string]int
var response map[string]interface{}
var query map[string]interface{}
action := "GetOIDCProvider"
conn, err := client.NewImsClient()
if err != nil {
return object, WrapError(err)
}
request = make(map[string]interface{})
query = make(map[string]interface{})
query["OIDCProviderName"] = id

wait := incrementalWait(3*time.Second, 5*time.Second)
err = resource.Retry(1*time.Minute, func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), query, request, &util.RuntimeOptions{})
response, err = client.RpcPost("Ims", "2019-08-15", action, query, request, false)

if err != nil {
if NeedRetry(err) {
Expand Down
10 changes: 2 additions & 8 deletions alicloud/service_alicloud_ram.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"time"

"github.com/PaesslerAG/jsonpath"
util "github.com/alibabacloud-go/tea-utils/service"
"github.com/aliyun/alibaba-cloud-sdk-go/sdk/requests"
"github.com/aliyun/alibaba-cloud-sdk-go/services/ecs"
"github.com/aliyun/alibaba-cloud-sdk-go/services/ram"
Expand Down Expand Up @@ -873,17 +872,12 @@ func (s *RamService) DescribeRamAccountPasswordPolicy(id string) (*ram.GetPasswo

func (s *RamService) DescribeRamSecurityPreference(id string) (object map[string]interface{}, err error) {
var response map[string]interface{}
conn, err := s.client.NewImsClient()
if err != nil {
return nil, WrapError(err)
}
client := s.client
action := "GetSecurityPreference"
request := map[string]interface{}{}
runtime := util.RuntimeOptions{}
runtime.SetAutoretry(true)
wait := incrementalWait(3*time.Second, 3*time.Second)
err = resource.Retry(5*time.Minute, func() *resource.RetryError {
response, err = conn.DoRequest(StringPointer(action), nil, StringPointer("POST"), StringPointer("2019-08-15"), StringPointer("AK"), nil, request, &runtime)
response, err = client.RpcPost("Ims", "2019-08-15", action, nil, request, true)
if err != nil {
if NeedRetry(err) {
wait()
Expand Down
Loading