Skip to content

Commit ad81aca

Browse files
mikejihbemikejihbe
committed
More datasource acceptance tests
1 parent 13c62c6 commit ad81aca

7 files changed

+36
-259
lines changed

‎data_source_obmcs_identity_user_group_membership_test.go‎

Lines changed: 12 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func (s *ResourceIdentityUserGroupMembershipsTestSuite) SetupTest() {
4343
description = "group desc"
4444
}
4545
resource "baremetal_identity_user_group_membership" "ug_membership" {
46-
compartment_id = "${var.compartment_id}"
46+
compartment_id = "${var.tenancy_ocid}"
4747
user_id = "${baremetal_identity_user.u.id}"
4848
group_id = "${baremetal_identity_group.g.id}"
4949
}
@@ -53,73 +53,21 @@ func (s *ResourceIdentityUserGroupMembershipsTestSuite) SetupTest() {
5353
}
5454

5555
func (s *ResourceIdentityUserGroupMembershipsTestSuite) TestGetUserGroupMembershipsByGroup() {
56-
config := s.Config
57-
config += `
56+
config := `
5857
data "baremetal_identity_user_group_memberships" "g_memberships" {
59-
compartment_id = "${var.compartment_id}"
58+
compartment_id = "${var.tenancy_ocid}"
6059
group_id = "${baremetal_identity_group.g.id}"
61-
}`
62-
resource.UnitTest(s.T(), resource.TestCase{
63-
PreventPostDestroyRefresh: true,
64-
Providers: s.Providers,
65-
Steps: []resource.TestStep{
66-
{
67-
ImportState: true,
68-
ImportStateVerify: true,
69-
Config: s.Config,
70-
Check: resource.ComposeTestCheckFunc(
71-
resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
72-
),
73-
},
74-
{
75-
Config: s.Config + config,
76-
Check: resource.ComposeTestCheckFunc(
77-
resource.TestCheckResourceAttrSet("data.baremetal_identity_user_group_memberships.g_memberships", "memberships.0.id"),
78-
),
79-
},
80-
},
81-
},
82-
)
83-
}
84-
85-
func (s *ResourceIdentityUserGroupMembershipsTestSuite) TestGetUserGroupMembershipsByUser() {
86-
config := s.Config
87-
config += `
88-
data "baremetal_identity_user_group_memberships" "u_memberships" {
89-
compartment_id = "${var.compartment_id}"
60+
}
61+
data "baremetal_identity_user_group_memberships" "u_memberships" {
62+
compartment_id = "${var.tenancy_ocid}"
9063
user_id = "${baremetal_identity_user.u.id}"
91-
}`
92-
resource.UnitTest(s.T(), resource.TestCase{
93-
PreventPostDestroyRefresh: true,
94-
Providers: s.Providers,
95-
Steps: []resource.TestStep{
96-
{
97-
ImportState: true,
98-
ImportStateVerify: true,
99-
Config: s.Config,
100-
Check: resource.ComposeTestCheckFunc(
101-
resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
102-
),
103-
},
104-
{
105-
Config: s.Config + config,
106-
Check: resource.ComposeTestCheckFunc(
107-
resource.TestCheckResourceAttrSet("data.baremetal_identity_user_group_memberships.u_memberships", "memberships.0.id"),
108-
),
109-
},
110-
},
111-
},
112-
)
113-
}
114-
115-
func (s *ResourceIdentityUserGroupMembershipsTestSuite) TestGetUserGroupMembershipsByUserAndGroup() {
116-
config := s.Config
117-
config += `
64+
}
11865
data "baremetal_identity_user_group_memberships" "ug_memberships" {
119-
compartment_id = "${var.compartment_id}"
66+
compartment_id = "${var.tenancy_ocid}"
12067
user_id = "${baremetal_identity_user.u.id}"
12168
group_id = "${baremetal_identity_group.g.id}"
122-
}`
69+
}
70+
`
12371
resource.UnitTest(s.T(), resource.TestCase{
12472
PreventPostDestroyRefresh: true,
12573
Providers: s.Providers,
@@ -135,6 +83,8 @@ func (s *ResourceIdentityUserGroupMembershipsTestSuite) TestGetUserGroupMembersh
13583
{
13684
Config: s.Config + config,
13785
Check: resource.ComposeTestCheckFunc(
86+
resource.TestCheckResourceAttrSet("data.baremetal_identity_user_group_memberships.g_memberships", "memberships.0.id"),
87+
resource.TestCheckResourceAttrSet("data.baremetal_identity_user_group_memberships.u_memberships", "memberships.0.id"),
13888
resource.TestCheckResourceAttrSet("data.baremetal_identity_user_group_memberships.ug_memberships", "memberships.0.id"),
13989
),
14090
},

‎data_source_obmcs_identity_user_group_memberships.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,15 @@ type UserGroupMembershipDatasourceCrud struct {
5151
}
5252

5353
func (s *UserGroupMembershipDatasourceCrud) Get() (e error) {
54-
s.Res, e = s.Client.ListUserGroupMemberships(nil)
54+
opts := &baremetal.ListMembershipsOptions{}
55+
if id, ok := s.D.GetOk("group_id"); ok {
56+
opts.GroupID = id.(string)
57+
}
58+
if id, ok := s.D.GetOk("user_id"); ok {
59+
opts.UserID = id.(string)
60+
}
61+
62+
s.Res, e = s.Client.ListUserGroupMemberships(opts)
5563
return
5664
}
5765

‎data_source_obmcs_load_balancer_policies_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ func TestLoadBalancerPoliciesDatasource(t *testing.T) {
2323
resourceName := "data.baremetal_load_balancer_policies.t"
2424
config := `
2525
data "baremetal_load_balancer_policies" "t" {
26-
compartment_id = "ocid1.compartment.stub_id"
26+
compartment_id = "${var.compartment_id}"
2727
}
2828
`
2929
config += testProviderConfig()
3030

31-
compartmentID := "ocid1.compartment.stub_id"
31+
compartmentID := "${var.compartment_id}"
3232
list := &baremetal.ListLoadBalancerPolicies{
3333
LoadBalancerPolicies: []baremetal.LoadBalancerPolicy{
3434
{Name: "stub_name1"},

‎data_source_obmcs_load_balancer_protocols_test.go‎

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package main
55
import (
66
"testing"
77

8-
"github.com/MustWin/baremetal-sdk-go"
98
"github.com/hashicorp/terraform/helper/resource"
109
"github.com/hashicorp/terraform/helper/schema"
1110
"github.com/hashicorp/terraform/terraform"
@@ -23,35 +22,20 @@ func TestLoadBalancerProtocolsDatasource(t *testing.T) {
2322
resourceName := "data.baremetal_load_balancer_protocols.t"
2423
config := `
2524
data "baremetal_load_balancer_protocols" "t" {
26-
compartment_id = "ocid1.compartment.stub_id"
25+
compartment_id = "${var.compartment_id}"
2726
}
2827
`
2928
config += testProviderConfig()
3029

31-
compartmentID := "ocid1.compartment.stub_id"
32-
list := &baremetal.ListLoadBalancerProtocols{
33-
LoadBalancerProtocols: []baremetal.LoadBalancerProtocol{
34-
{Name: "stub_name1"},
35-
{Name: "stub_name2"},
36-
},
37-
}
38-
client.On(
39-
"ListLoadBalancerProtocols",
40-
compartmentID,
41-
(*baremetal.ListLoadBalancerPolicyOptions)(nil),
42-
).Return(list, nil)
43-
4430
resource.UnitTest(t, resource.TestCase{
4531
PreventPostDestroyRefresh: true,
4632
Providers: providers,
4733
Steps: []resource.TestStep{
4834
{
4935
Config: config,
5036
Check: resource.ComposeAggregateTestCheckFunc(
51-
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentID),
52-
resource.TestCheckResourceAttr(resourceName, "protocols.#", "2"),
53-
resource.TestCheckResourceAttr(resourceName, "protocols.0.name", "stub_name1"),
54-
resource.TestCheckResourceAttr(resourceName, "protocols.1.name", "stub_name2"),
37+
resource.TestCheckResourceAttrSet(resourceName, "protocols.#"),
38+
resource.TestCheckResourceAttrSet(resourceName, "protocols.0.name"),
5539
),
5640
},
5741
},

‎data_source_obmcs_load_balancer_shapes_test.go‎

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package main
55
import (
66
"testing"
77

8-
"github.com/MustWin/baremetal-sdk-go"
98
"github.com/hashicorp/terraform/helper/resource"
109
"github.com/hashicorp/terraform/helper/schema"
1110
"github.com/hashicorp/terraform/terraform"
@@ -23,35 +22,21 @@ func TestLoadBalancerShapesDatasource(t *testing.T) {
2322
resourceName := "data.baremetal_load_balancer_shapes.t"
2423
config := `
2524
data "baremetal_load_balancer_shapes" "t" {
26-
compartment_id = "ocid1.compartment.stub_id"
25+
compartment_id = "${var.compartment_id}"
2726
}
2827
`
2928
config += testProviderConfig()
3029

31-
compartmentID := "ocid1.compartment.stub_id"
32-
list := &baremetal.ListLoadBalancerShapes{
33-
LoadBalancerShapes: []baremetal.LoadBalancerShape{
34-
{Name: "stub_name1"},
35-
{Name: "stub_name2"},
36-
},
37-
}
38-
client.On(
39-
"ListLoadBalancerShapes",
40-
compartmentID,
41-
(*baremetal.ListLoadBalancerPolicyOptions)(nil),
42-
).Return(list, nil)
43-
4430
resource.UnitTest(t, resource.TestCase{
4531
PreventPostDestroyRefresh: true,
4632
Providers: providers,
4733
Steps: []resource.TestStep{
4834
{
4935
Config: config,
5036
Check: resource.ComposeAggregateTestCheckFunc(
51-
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentID),
52-
resource.TestCheckResourceAttr(resourceName, "shapes.#", "2"),
53-
resource.TestCheckResourceAttr(resourceName, "shapes.0.name", "stub_name1"),
54-
resource.TestCheckResourceAttr(resourceName, "shapes.1.name", "stub_name2"),
37+
resource.TestCheckResourceAttrSet(resourceName, "shapes.#"),
38+
resource.TestCheckResourceAttrSet(resourceName, "shapes.0.name"),
39+
resource.TestCheckResourceAttrSet(resourceName, "shapes.1.name"),
5540
),
5641
},
5742
},

‎data_source_obmcs_load_balancers_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ func TestLoadBalancersDatasource(t *testing.T) {
2525
resourceName := "data.baremetal_load_balancers.t"
2626
config := `
2727
data "baremetal_load_balancers" "t" {
28-
compartment_id = "ocid1.compartment.stub_id"
28+
compartment_id = "${var.compartment_id}"
2929
}
3030
`
3131
config += testProviderConfig()
3232

33-
compartmentID := "ocid1.compartment.stub_id"
33+
compartmentID := "${var.compartment_id}"
3434
lb1 := baremetal.LoadBalancer{
3535
CompartmentID: compartmentID,
3636
ID: "ocid1.loadbalancer.stub_id1",

0 commit comments

Comments
 (0)