Add the feature of resource-level region[1/2] #616
Conversation
|
@qzyu92 Thanks for your effort. I suggest you can also update the docs along with the patch. |
| projectID, ok := RegionProjectIDMap.Load(region) | ||
| if !ok { | ||
| // Not find in the map, then try to query and store. | ||
| err := c.loadUserProjects(client, region) |
There was a problem hiding this comment.
as resources are created in parallel, we must have a mutex here.
There was a problem hiding this comment.
Yes, I'm working on it. Will fix it in the following patch.
There was a problem hiding this comment.
I have added a mutex around here, and there is no more duplicate http request in my local test, please review about it.
huaweicloud/config.go
Outdated
| Name: region, | ||
| } | ||
| sc := new(golangsdk.ServiceClient) | ||
| sc.Endpoint = fmt.Sprintf("https://iam.%s/v3/", c.Cloud) |
There was a problem hiding this comment.
suggest to set Endpoint by c.IdentityEndpoint
There was a problem hiding this comment.
Yeah, and I have modified about this.
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Computed: true, | ||
| ForceNew: true, |
There was a problem hiding this comment.
ForceNew is useless in data source
There was a problem hiding this comment.
Got, I will fix it.
| "region": { | ||
| Type: schema.TypeString, | ||
| Optional: true, | ||
| Computed: true, |
There was a problem hiding this comment.
ForceNew must be true when region has changed for resource.
There was a problem hiding this comment.
Got it, I will push a patch and fix this.
|
|
@ShiChangkuo The docs have been modified, and will push another request for it. |
markyu92
changed the title
|
@ShiChangkuo The modification of docs refs #622 |
| resource "huaweicloud_vpc" "test2" { | ||
| name = "%s" | ||
| region = "%s" | ||
| cidr = "192.168.0.0/16" | ||
| } |
There was a problem hiding this comment.
please format the resource with HCL style
There was a problem hiding this comment.
I have fixed this by modifing it’s indentation into two blanks.
huaweicloud/config.go
Outdated
| } | ||
|
|
||
| func (c *Config) newServiceClientByName(client *golangsdk.ProviderClient, catalog ServiceCatalog, region string) (*golangsdk.ServiceClient, error) { | ||
| if catalog.Name == "" || catalog.Version == "" { | ||
| return nil, fmt.Errorf("must specify the service name and api version") | ||
| } | ||
|
|
||
| // Resource-level region only supports AK/SK authentication. | ||
| if region != c.Region && (c.AccessKey == "" || c.SecretKey == "") { | ||
| return nil, fmt.Errorf("Resource-level region must be same as Provider-level region when not AK/SK authentication if Resource-level region setted") |
There was a problem hiding this comment.
"Resource-level region must be same as Provider-level region when using non AK/SK authentication" seems better :P
There was a problem hiding this comment.
Cool, that seems better truly.
Add region to datasource Add region to resource Add resource-level region test case for `resource_huaweicloud_vpc`
Intro
Based on provider-level region, this commit add an optional param named
regionin each resource and datasource.User can manage cloud-resources in different regions just in a single
tffile by confingregionparam in resource or datasource.But, plase read the following attentions:
regionin resource or datasource but authed by user-name/pwd or token, then the resource-level region must be the same with the provider-level region. Or you will get an error.Test
Have commited a test case in
resource_huaweicloud_vpc_test.go, namedTestAccVpcV1_WithCustomRegion, and there is the test script and result.