Merge branch 'master' into catchup-to-mw

Author: mikejihbe

docs/resources/core/group.md

@@ -7,13 +7,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MustWin/baremetal-sdk-go"
-	"github.com/oracle/terraform-provider-baremetal/client/mocks"
+	"github.com/stretchr/testify/suite"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
-	"github.com/stretchr/testify/suite"
+	"github.com/MustWin/baremetal-sdk-go"
+	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 )
 
 var testPoliciesConfig = `

identity_policy_datasource_test.go

@@ -6,15 +6,16 @@ import (
 	"fmt"
 	"testing"
 	"time"
+	"strconv"
 
-	"github.com/MustWin/baremetal-sdk-go"
-	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
-
 	"github.com/stretchr/testify/suite"
-	"strconv"
+
+	"github.com/MustWin/baremetal-sdk-go"
+	"github.com/oracle/terraform-provider-baremetal/client/mocks"
+
 )
 
 var testPasswordsConfig = `

identity_swift_password_datasource_test.go

@@ -6,13 +6,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/MustWin/baremetal-sdk-go"
-	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
-
 	"github.com/stretchr/testify/suite"
+
+	"github.com/MustWin/baremetal-sdk-go"
+	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 )
 
 type ResourceIdentitySwiftPasswordTestSuite struct {

identity_swift_password_test.go

@@ -5,15 +5,16 @@ package main
 import (
 	"testing"
 	"time"
+	"fmt"
 
-	"github.com/MustWin/baremetal-sdk-go"
-	"github.com/oracle/terraform-provider-baremetal/client/mocks"
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
-
 	"github.com/stretchr/testify/suite"
-	"fmt"
+
+	"github.com/MustWin/baremetal-sdk-go"
+	"github.com/oracle/terraform-provider-baremetal/client/mocks"
+
 )
 
 type ResourceIdentityUserGroupMembershipsTestSuite struct {

identity_user_group_membership_datasource_test.go

@@ -24,7 +24,7 @@ func init() {
 		"fingerprint":  "(Required) The fingerprint for the user's RSA key. This can be found in user settings in the Bare Metal console.",
 		"private_key": "(Optional) A PEM formatted RSA private key for the user.\n" +
 			"A private_key or a private_key_path must be provided.",
-		"private_key_path": "(Required) The path to the user's PEM formatted private key.\n" +
+		"private_key_path": "(Optional) The path to the user's PEM formatted private key.\n" +
 			"A private_key or a private_key_path must be provided.",
 		"private_key_password": "(Optional) The password used to secure the private key.",
 	}