Skip to content

Commit 2ba4c09

Browse files
codycushingcodycushing
authored
Merge pull request #137 from MustWin/master
Fix LB issues
2 parents 10c189a + 37bfa45 commit 2ba4c09

16 files changed

+199
-24
lines changed

‎.github/ISSUE_TEMPLATE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44

55
## A self-contained terraform file that reproduces the issue:
66

7-
7+
(If this is not provided, your ticket will be closed)
88

‎crud/helpers.go‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,16 @@ package crud
44

55
import (
66
"errors"
7-
"github.com/MustWin/baremetal-sdk-go"
8-
"github.com/hashicorp/terraform/helper/resource"
9-
"github.com/hashicorp/terraform/helper/schema"
10-
"github.com/oracle/terraform-provider-baremetal/client"
117
"log"
128
"reflect"
139
"strconv"
1410
"strings"
1511
"time"
12+
13+
"github.com/MustWin/baremetal-sdk-go"
14+
"github.com/hashicorp/terraform/helper/resource"
15+
"github.com/hashicorp/terraform/helper/schema"
16+
"github.com/oracle/terraform-provider-baremetal/client"
1617
)
1718

1819
var (
@@ -72,6 +73,7 @@ func handleMissingResourceError(sync ResourceVoider, err *error) {
7273
strings.Contains((*err).Error(), " not present in ") ||
7374
strings.Contains((*err).Error(), "resource not found") ||
7475
(strings.Contains((*err).Error(), "Load balancer") && strings.Contains((*err).Error(), " has no ")) {
76+
7577
log.Println("[DEBUG] Object does not exist, voiding resource and nullifying error")
7678
sync.VoidState()
7779
*err = nil

‎provider_test.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,8 @@ variable "DBNodeHostName" {
222222
database {
223223
"admin_password" = "${var.DBAdminPassword}"
224224
"db_name" = "${var.DBName}"
225+
character_set = "AL32UTF8"
226+
ncharacter_set = "AL16UTF16"
225227
}
226228
db_version = "${var.DBVersion}"
227229
display_name = "MyTFDB"

‎resource_obmcs_core_instance.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
package main
44

55
import (
6+
"log"
7+
68
"github.com/MustWin/baremetal-sdk-go"
79
"github.com/hashicorp/terraform/helper/schema"
810
"github.com/oracle/terraform-provider-baremetal/client"
911
"github.com/oracle/terraform-provider-baremetal/crud"
1012
"github.com/oracle/terraform-provider-baremetal/options"
11-
"log"
1213
)
1314

1415
func InstanceResource() *schema.Resource {
@@ -26,7 +27,7 @@ func InstanceResource() *schema.Resource {
2627
Update: updateInstance,
2728
Delete: deleteInstance,
2829
Schema: map[string]*schema.Schema{
29-
"create_vnic_details": &schema.Schema{
30+
"create_vnic_details": {
3031
Type: schema.TypeMap,
3132
Optional: true,
3233
Elem: &schema.Resource{

‎resource_obmcs_core_ipsec_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ func (s *ResourceCoreIPSecTestSuite) SetupTest() {
5050
compartment_id = "${var.compartment_id}"
5151
display_name = "displayname"
5252
ip_address = "123.123.123.123"
53-
depends_on = ["baremetal_core_drg.t"}
53+
depends_on = ["baremetal_core_drg.t"]
5454
}
5555
resource "baremetal_core_ipsec" "t" {
5656
compartment_id = "${var.compartment_id}"

‎resource_obmcs_core_security_list_test.go‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
package main
44

55
import (
6+
"testing"
7+
"time"
8+
69
"github.com/MustWin/baremetal-sdk-go"
710
"github.com/hashicorp/terraform/helper/resource"
811
"github.com/hashicorp/terraform/helper/schema"
912
"github.com/hashicorp/terraform/terraform"
1013
"github.com/oracle/terraform-provider-baremetal/crud"
1114
"github.com/stretchr/testify/suite"
12-
"testing"
13-
"time"
1415
)
1516

1617
type ResourceCoreSecurityListTestSuite struct {

‎resource_obmcs_database_db_system.go‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ func DBSystemResource() *schema.Resource {
9292
Type: schema.TypeString,
9393
Required: true,
9494
},
95+
"character_set": {
96+
Type: schema.TypeString,
97+
Optional: true,
98+
},
99+
"ncharacter_set": {
100+
Type: schema.TypeString,
101+
Optional: true,
102+
},
95103
},
96104
},
97105
},
@@ -230,6 +238,8 @@ func (s *DBSystemResourceCrud) Create() (e error) {
230238
displayName := dbHome["display_name"]
231239
adminPassword := db["admin_password"].(string)
232240
dbName := db["db_name"].(string)
241+
characterSet := db["character_set"].(string)
242+
ncharacterSet := db["ncharacter_set"].(string)
233243
dbVersion := dbHome["db_version"].(string)
234244

235245
dbHomeOpts := &baremetal.DisplayNameOptions{}
@@ -238,7 +248,7 @@ func (s *DBSystemResourceCrud) Create() (e error) {
238248
}
239249

240250
dbHomeDetails := baremetal.NewCreateDBHomeDetails(
241-
adminPassword, dbName, dbVersion, dbHomeOpts,
251+
adminPassword, dbName, dbVersion, characterSet, ncharacterSet, dbHomeOpts,
242252
)
243253
opts.DBHome = dbHomeDetails
244254
}

‎resource_obmcs_identity_user_group_membership_test.go‎

Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
// Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
2+
3+
package main
4+
5+
import (
6+
"testing"
7+
8+
"github.com/hashicorp/terraform/helper/resource"
9+
"github.com/hashicorp/terraform/helper/schema"
10+
"github.com/hashicorp/terraform/terraform"
11+
"github.com/stretchr/testify/suite"
12+
)
13+
14+
type ResourceIdentityUserGroupMembershipTestSuite struct {
15+
suite.Suite
16+
Client mockableClient
17+
Config string
18+
Provider terraform.ResourceProvider
19+
Providers map[string]terraform.ResourceProvider
20+
ResourceName string
21+
}
22+
23+
func (s *ResourceIdentityUserGroupMembershipTestSuite) SetupTest() {
24+
s.Client = GetTestProvider()
25+
s.Provider = Provider(func(d *schema.ResourceData) (interface{}, error) {
26+
return s.Client, nil
27+
})
28+
29+
s.Providers = map[string]terraform.ResourceProvider{
30+
"baremetal": s.Provider,
31+
}
32+
33+
s.Config = `
34+
resource "baremetal_identity_user" "u" {
35+
name = "user_name"
36+
description = "user desc"
37+
}
38+
resource "baremetal_identity_group" "g" {
39+
name = "group_name"
40+
description = "group desc"
41+
}
42+
resource "baremetal_identity_user_group_membership" "ug_membership" {
43+
compartment_id = "${var.tenancy_ocid}"
44+
user_id = "${baremetal_identity_user.u.id}"
45+
group_id = "${baremetal_identity_group.g.id}"
46+
}
47+
`
48+
s.Config += testProviderConfig()
49+
s.ResourceName = "baremetal_identity_user_group_membership.ug_membership"
50+
}
51+
52+
func (s *ResourceIdentityUserGroupMembershipTestSuite) TestGetUserGroupMembershipsByGroup() {
53+
resource.UnitTest(s.T(), resource.TestCase{
54+
PreventPostDestroyRefresh: true,
55+
Providers: s.Providers,
56+
Steps: []resource.TestStep{
57+
{
58+
ImportState: true,
59+
ImportStateVerify: true,
60+
Config: s.Config,
61+
Check: resource.ComposeTestCheckFunc(
62+
resource.TestCheckResourceAttrSet(s.ResourceName, "id"),
63+
),
64+
},
65+
{
66+
Config: s.Config,
67+
Check: resource.ComposeTestCheckFunc(
68+
resource.TestCheckResourceAttrSet("baremetal_identity_user_group_membership.ug_membership", "user_id"),
69+
),
70+
},
71+
},
72+
},
73+
)
74+
}
75+
76+
func TestResourceIdentityUserGroupMembershipTestSuite(t *testing.T) {
77+
suite.Run(t, new(ResourceIdentityUserGroupMembershipTestSuite))
78+
}

‎resource_obmcs_loadbalancer_backend.go‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33
package main
44

55
import (
6+
"log"
7+
"strconv"
8+
69
"github.com/MustWin/baremetal-sdk-go"
710
"github.com/hashicorp/terraform/helper/schema"
811
"github.com/oracle/terraform-provider-baremetal/client"
912
"github.com/oracle/terraform-provider-baremetal/crud"
10-
"log"
11-
"strconv"
1213
)
1314

1415
func LoadBalancerBackendResource() *schema.Resource {
@@ -58,6 +59,7 @@ func LoadBalancerBackendResource() *schema.Resource {
5859
"weight": {
5960
Type: schema.TypeInt,
6061
Optional: true,
62+
Computed: true,
6163
},
6264
// internal for work request access
6365
"state": {

‎resource_obmcs_loadbalancer_certificate.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package main
44

55
import (
66
"errors"
7+
78
"github.com/MustWin/baremetal-sdk-go"
89
"github.com/hashicorp/terraform/helper/schema"
910
"github.com/oracle/terraform-provider-baremetal/client"

0 commit comments

Comments
 (0)