Skip to content

Commit 73adf63

Browse files
kayrusozerovandrei
kayrus
authored and
ozerovandrei
committed
Internal: Decouple Authentication (terraform-provider-openstack#930)
* Internal: Decouple Authentication * Add network_2 id to openstack_networking_subnet_v2.subnet_2
1 parent f300a57 commit 73adf63

225 files changed

Lines changed: 1142 additions & 817 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/terraform-providers/terraform-provider-openstack
22

33
require (
4-
github.com/gophercloud/gophercloud v0.6.1-0.20191019020556-0907b320e0ac
5-
github.com/gophercloud/utils v0.0.0-20191020172814-bd86af96d544
4+
github.com/gophercloud/gophercloud v0.6.1-0.20191127023939-978be3847c66
5+
github.com/gophercloud/utils v0.0.0-20191127023131-25012218dfd5
66
github.com/hashicorp/terraform-plugin-sdk v1.1.1
77
github.com/mitchellh/go-homedir v1.1.0
88
github.com/stretchr/testify v1.3.0

‎go.sum‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,10 @@ github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+
6767
github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
6868
github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
6969
github.com/gophercloud/gophercloud v0.0.0-20190212181753-892256c46858/go.mod h1:vxM41WHh5uqHVBMZHzuwNOHh8XEoIEcSTewFxm1c5g8=
70-
github.com/gophercloud/gophercloud v0.6.0 h1:Xb2lcqZtml1XjgYZxbeayEemq7ASbeTp09m36gQFpEU=
71-
github.com/gophercloud/gophercloud v0.6.1-0.20191019020556-0907b320e0ac h1:UgFA3AhICqIi19wVZRdcJDdF9fODhGnNUhSwClUgUGU=
72-
github.com/gophercloud/gophercloud v0.6.1-0.20191019020556-0907b320e0ac/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbGkcYwAR7EZK2WMqM=
73-
github.com/gophercloud/utils v0.0.0-20191020172814-bd86af96d544 h1:tnybJ2o5gp2wWaKB0jgNp2sa7oDHVI6wkPtNEs/2B7E=
74-
github.com/gophercloud/utils v0.0.0-20191020172814-bd86af96d544/go.mod h1:SZ9FTKibIotDtCrxAU/evccoyu1yhKST6hgBvwTB5Eg=
70+
github.com/gophercloud/gophercloud v0.6.1-0.20191127023939-978be3847c66 h1:ycTHq0WXvSquDA30q6XPhAuK8udKKMWAeaxix8phcyo=
71+
github.com/gophercloud/gophercloud v0.6.1-0.20191127023939-978be3847c66/go.mod h1:ozGNgr9KYOVATV5jsgHl/ceCDXGuguqOZAzoQ/2vcNM=
72+
github.com/gophercloud/utils v0.0.0-20191127023131-25012218dfd5 h1:UgI3a8UTi1wv/P0gqF0e3Q3Z8mMJcsWmz0ypreqJMpE=
73+
github.com/gophercloud/utils v0.0.0-20191127023131-25012218dfd5/go.mod h1:SZ9FTKibIotDtCrxAU/evccoyu1yhKST6hgBvwTB5Eg=
7574
github.com/hashicorp/errwrap v0.0.0-20180715044906-d6c0cd880357/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
7675
github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
7776
github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

‎openstack/compute_instance_v2.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ func getInstanceNetworkInfo(
160160
config := meta.(*Config)
161161

162162
if _, ok := os.LookupEnv("OS_NOVA_NETWORK"); !ok {
163-
networkClient, err := config.networkingV2Client(GetRegion(d, config))
163+
networkClient, err := config.NetworkingV2Client(GetRegion(d, config))
164164
if err == nil {
165165
networkInfo, err := getInstanceNetworkInfoNeutron(networkClient, queryType, queryTerm)
166166
if err != nil {
@@ -173,7 +173,7 @@ func getInstanceNetworkInfo(
173173

174174
log.Printf("[DEBUG] Unable to obtain a network client")
175175

176-
computeClient, err := config.computeV2Client(GetRegion(d, config))
176+
computeClient, err := config.ComputeV2Client(GetRegion(d, config))
177177
if err != nil {
178178
return nil, fmt.Errorf("Error creating OpenStack compute client: %s", err)
179179
}
@@ -412,7 +412,7 @@ func flattenInstanceNetworks(
412412
d *schema.ResourceData, meta interface{}) ([]map[string]interface{}, error) {
413413

414414
config := meta.(*Config)
415-
computeClient, err := config.computeV2Client(GetRegion(d, config))
415+
computeClient, err := config.ComputeV2Client(GetRegion(d, config))
416416
if err != nil {
417417
return nil, fmt.Errorf("Error creating OpenStack compute client: %s", err)
418418
}

‎openstack/data_source_openstack_blockstorage_availability_zones_v3.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func dataSourceBlockStorageAvailabilityZonesV3() *schema.Resource {
4040

4141
func dataSourceBlockStorageAvailabilityZonesV3Read(d *schema.ResourceData, meta interface{}) error {
4242
config := meta.(*Config)
43-
client, err := config.blockStorageV3Client(GetRegion(d, config))
43+
client, err := config.BlockStorageV3Client(GetRegion(d, config))
4444
if err != nil {
4545
return fmt.Errorf("Error creating OpenStack block storage client: %s", err)
4646
}

‎openstack/data_source_openstack_blockstorage_snapshot_v2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func dataSourceBlockStorageSnapshotV2() *schema.Resource {
6363

6464
func dataSourceBlockStorageSnapshotV2Read(d *schema.ResourceData, meta interface{}) error {
6565
config := meta.(*Config)
66-
client, err := config.blockStorageV2Client(GetRegion(d, config))
66+
client, err := config.BlockStorageV2Client(GetRegion(d, config))
6767
if err != nil {
6868
return fmt.Errorf("Error creating OpenStack block storage client: %s", err)
6969
}

‎openstack/data_source_openstack_blockstorage_snapshot_v2_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func testAccBlockStorageV2CreateVolumeAndSnapshot(volumeName, snapshotName strin
5151
return "", "", err
5252
}
5353

54-
bsClient, err := config.blockStorageV2Client(OS_REGION_NAME)
54+
bsClient, err := config.BlockStorageV2Client(OS_REGION_NAME)
5555
if err != nil {
5656
return "", "", err
5757
}
@@ -95,7 +95,7 @@ func testAccBlockStorageV2DeleteVolumeAndSnapshot(t *testing.T, volumeID, snapsh
9595
t.Fatal(err)
9696
}
9797

98-
bsClient, err := config.blockStorageV2Client(OS_REGION_NAME)
98+
bsClient, err := config.BlockStorageV2Client(OS_REGION_NAME)
9999
if err != nil {
100100
t.Fatal(err)
101101
}

‎openstack/data_source_openstack_blockstorage_snapshot_v3.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func dataSourceBlockStorageSnapshotV3() *schema.Resource {
6363

6464
func dataSourceBlockStorageSnapshotV3Read(d *schema.ResourceData, meta interface{}) error {
6565
config := meta.(*Config)
66-
client, err := config.blockStorageV3Client(GetRegion(d, config))
66+
client, err := config.BlockStorageV3Client(GetRegion(d, config))
6767
if err != nil {
6868
return fmt.Errorf("Error creating OpenStack block storage client: %s", err)
6969
}

‎openstack/data_source_openstack_blockstorage_snapshot_v3_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ func testAccBlockStorageV3CreateVolumeAndSnapshot(volumeName, snapshotName strin
5151
return "", "", err
5252
}
5353

54-
bsClient, err := config.blockStorageV3Client(OS_REGION_NAME)
54+
bsClient, err := config.BlockStorageV3Client(OS_REGION_NAME)
5555
if err != nil {
5656
return "", "", err
5757
}
@@ -95,7 +95,7 @@ func testAccBlockStorageV3DeleteVolumeAndSnapshot(t *testing.T, volumeID, snapsh
9595
t.Fatal(err)
9696
}
9797

98-
bsClient, err := config.blockStorageV3Client(OS_REGION_NAME)
98+
bsClient, err := config.BlockStorageV3Client(OS_REGION_NAME)
9999
if err != nil {
100100
t.Fatal(err)
101101
}

‎openstack/data_source_openstack_compute_availability_zones_v2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ func dataSourceComputeAvailabilityZonesV2() *schema.Resource {
4141
func dataSourceComputeAvailabilityZonesV2Read(d *schema.ResourceData, meta interface{}) error {
4242
config := meta.(*Config)
4343
region := GetRegion(d, config)
44-
computeClient, err := config.computeV2Client(region)
44+
computeClient, err := config.ComputeV2Client(region)
4545
if err != nil {
4646
return fmt.Errorf("Error creating OpenStack compute client: %s", err)
4747
}

‎openstack/data_source_openstack_compute_flavor_v2.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ func dataSourceComputeFlavorV2() *schema.Resource {
9797
// dataSourceComputeFlavorV2Read performs the flavor lookup.
9898
func dataSourceComputeFlavorV2Read(d *schema.ResourceData, meta interface{}) error {
9999
config := meta.(*Config)
100-
computeClient, err := config.computeV2Client(GetRegion(d, config))
100+
computeClient, err := config.ComputeV2Client(GetRegion(d, config))
101101
if err != nil {
102102
return fmt.Errorf("Error creating OpenStack compute client: %s", err)
103103
}

0 commit comments

Comments
 (0)