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

Jump to bottom

resource/alicloud_cr_ee_instance: add new attributes default_oss_bucket, image_scanner and resource_group_id. #7874

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+836 −237
Open

resource/alicloud_cr_ee_instance: add new attributes default_oss_bucket, image_scanner and resource_group_id. #7874

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
5 changes: 3 additions & 2 deletions alicloud/connectivity/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4222,10 +4222,11 @@ func (client *AliyunClient) NewServicemeshClient() (*rpc.Client, error) {

func (client *AliyunClient) NewAcrClient() (*rpc.Client, error) {
productCode := "acr"
endpoint := ""
endpoint := client.config.CrEndpoint

if v, ok := client.config.Endpoints.Load(productCode); !ok || v.(string) == "" {
if err := client.loadEndpoint(productCode); err != nil {
endpoint = fmt.Sprintf("acr.%s.aliyuncs.com", client.config.RegionId)
endpoint = fmt.Sprintf("cr.%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)
}
Expand Down
2 changes: 1 addition & 1 deletion alicloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1156,7 +1156,7 @@ func Provider() terraform.ResourceProvider {
"alicloud_cs_autoscaling_config": resourceAlicloudCSAutoscalingConfig(),
"alicloud_cr_namespace": resourceAlicloudCRNamespace(),
"alicloud_cr_repo": resourceAlicloudCRRepo(),
"alicloud_cr_ee_instance": resourceAlicloudCrEEInstance(),
"alicloud_cr_ee_instance": resourceAliCloudCrInstance(),
"alicloud_cr_ee_namespace": resourceAliCloudCrEENamespace(),
"alicloud_cr_ee_repo": resourceAliCloudCrEERepo(),
"alicloud_cr_ee_sync_rule": resourceAliCloudCrEESyncRule(),
Expand Down
Loading
Loading