resource/aws_servicecatalog_portfolio: Replace IdempotencyToken time.…

…Now() usage with resource.UniqueId()

Reference: #9470

The implementation of `resource.UniqueId()` includes a monotonic counter, so it is safer for concurrent operations.

Output from acceptance testing:

```
--- PASS: TestAccAWSServiceCatalogPortfolio_Disappears (10.62s)
--- PASS: TestAccAWSServiceCatalogPortfolio_Import (13.26s)
--- PASS: TestAccAWSServiceCatalogPortfolio_Basic (29.31s)
```

aws/resource_aws_servicecatalog_portfolio.go

@@ -8,6 +8,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/servicecatalog"
+	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/helper/validation"
 )
@@ -61,12 +62,10 @@ func resourceAwsServiceCatalogPortfolio() *schema.Resource {
 func resourceAwsServiceCatalogPortfolioCreate(d *schema.ResourceData, meta interface{}) error {
 	conn := meta.(*AWSClient).scconn
 	input := servicecatalog.CreatePortfolioInput{
-		AcceptLanguage: aws.String("en"),
+		AcceptLanguage:   aws.String("en"),
+		DisplayName:      aws.String(d.Get("name").(string)),
+		IdempotencyToken: aws.String(resource.UniqueId()),
 	}
-	name := d.Get("name").(string)
-	input.DisplayName = &name
-	now := time.Now()
-	input.IdempotencyToken = aws.String(fmt.Sprintf("%d", now.UnixNano()))
 
 	if v, ok := d.GetOk("description"); ok {
 		input.Description = aws.String(v.(string))

aws/resource_aws_servicecatalog_portfolio_test.go

@@ -13,7 +13,7 @@ import (
 	"testing"
 )
 
-func TestAccAWSServiceCatalogPortfolioBasic(t *testing.T) {
+func TestAccAWSServiceCatalogPortfolio_Basic(t *testing.T) {
 	name := acctest.RandString(5)
 	var dpo servicecatalog.DescribePortfolioOutput
 	resource.ParallelTest(t, resource.TestCase{
@@ -65,7 +65,7 @@ func TestAccAWSServiceCatalogPortfolioBasic(t *testing.T) {
 	})
 }
 
-func TestAccAWSServiceCatalogPortfolioDisappears(t *testing.T) {
+func TestAccAWSServiceCatalogPortfolio_Disappears(t *testing.T) {
 	name := acctest.RandString(5)
 	var dpo servicecatalog.DescribePortfolioOutput
 	resource.ParallelTest(t, resource.TestCase{
@@ -85,7 +85,7 @@ func TestAccAWSServiceCatalogPortfolioDisappears(t *testing.T) {
 	})
 }
 
-func TestAccAWSServiceCatalogPortfolioImport(t *testing.T) {
+func TestAccAWSServiceCatalogPortfolio_Import(t *testing.T) {
 	resourceName := "aws_servicecatalog_portfolio.test"
 
 	name := acctest.RandString(5)