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

Add huaweicloud_api_gateway_group and huaweicloud_api_gateway_api resources #270

Merged
merged 4 commits into from
Mar 2, 2020
Merged

Add huaweicloud_api_gateway_group and huaweicloud_api_gateway_api resources #270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d7153e6
Add huaweicloud_api_gateway_group resource and doc
ShiChangkuo Feb 29, 2020
296b082
sync vendor from huaweicloud golangsdk
ShiChangkuo Feb 29, 2020
e2a0de0
Add huaweicloud_api_gateway_api resource and doc
ShiChangkuo Mar 2, 2020
1feef03
Merge branch 'master' into feature-apig
niuzhenguo Mar 2, 2020
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ require (
github.com/hashicorp/errwrap v1.0.0
github.com/hashicorp/go-cleanhttp v0.5.1
github.com/hashicorp/terraform-plugin-sdk v1.0.0
github.com/huaweicloud/golangsdk v0.0.0-20200214070017-e223495ff90d
github.com/huaweicloud/golangsdk v0.0.0-20200229071744-cde13ac05a94
github.com/jen20/awspolicyequivalence v0.0.0-20170831201602-3d48364a137a
github.com/mitchellh/go-homedir v1.1.0
github.com/smartystreets/goconvey v0.0.0-20190222223459-a17d461953aa // indirect
Expand Down
5 changes: 3 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,9 @@ github.com/huaweicloud/golangsdk v0.0.0-20191210113552-8f6bd7a6f1d8 h1:7dfGs0ENj
github.com/huaweicloud/golangsdk v0.0.0-20191210113552-8f6bd7a6f1d8/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw=
github.com/huaweicloud/golangsdk v0.0.0-20200204080439-744c2b9d7746 h1:c2HOmXuDF1VSiBdCZAPo6kbOSTt9Kh6jV87mmiegkE0=
github.com/huaweicloud/golangsdk v0.0.0-20200204080439-744c2b9d7746/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw=
github.com/huaweicloud/golangsdk v0.0.0-20200214070017-e223495ff90d h1:9zNtiJP0i3E6p/Psh4sC3OiRpJyc5oVmvReMgovwqp0=
github.com/huaweicloud/golangsdk v0.0.0-20200214070017-e223495ff90d/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw=
github.com/huaweicloud/golangsdk v0.0.0-20200226090834-31e7d87f9e61 h1:cHkhULuZneNT7GRwigfbRM8IXxLH4mNdDEUezszJ3go=
github.com/huaweicloud/golangsdk v0.0.0-20200229071744-cde13ac05a94 h1:3MKOAqfBneQCxf7+GMMql6n+JIvE+rmdgtjoM1IhDWc=
github.com/huaweicloud/golangsdk v0.0.0-20200229071744-cde13ac05a94/go.mod h1:WQBcHRNX9shz3928lWEvstQJtAtYI7ks6XlgtRT9Tcw=
github.com/jen20/awspolicyequivalence v0.0.0-20170831201602-3d48364a137a h1:FyS/ubzBR5xJlnJGRTwe7GUHpJOR4ukYK3y+LFNffuA=
github.com/jen20/awspolicyequivalence v0.0.0-20170831201602-3d48364a137a/go.mod h1:uoIMjNxUfXi48Ci40IXkPRbghZ1vbti6v9LCbNqRgHY=
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
Expand Down
7 changes: 7 additions & 0 deletions huaweicloud/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,6 +436,13 @@ func (c *Config) newObjectStorageClient(region string) (*obs.ObsClient, error) {
return obs.New(c.AccessKey, c.SecretKey, client.Endpoint)
}

func (c *Config) apiGatewayV1Client(region string) (*golangsdk.ServiceClient, error) {
return huaweisdk.ApiGateWayV1(c.HwClient, golangsdk.EndpointOpts{
Region: c.determineRegion(region),
Availability: c.getHwEndpointType(),
})
}

func (c *Config) blockStorageV1Client(region string) (*golangsdk.ServiceClient, error) {
return huaweisdk.NewBlockStorageV1(c.HwClient, golangsdk.EndpointOpts{
Region: c.determineRegion(region),
Expand Down
2 changes: 2 additions & 0 deletions huaweicloud/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,8 @@ func Provider() terraform.ResourceProvider {
},

ResourcesMap: map[string]*schema.Resource{
"huaweicloud_api_gateway_group": resourceAPIGatewayGroup(),
"huaweicloud_api_gateway_api": resourceAPIGatewayAPI(),
"huaweicloud_blockstorage_volume_v2": resourceBlockStorageVolumeV2(),
"huaweicloud_compute_instance_v2": resourceComputeInstanceV2(),
"huaweicloud_compute_interface_attach_v2": resourceComputeInterfaceAttachV2(),
Expand Down
Loading