Move loadbalancer api into the main package, Handle duplicate name overloaded names

mikejihbe · codycushing · commit ff24bab1e3ba · 2017-05-14T15:46:33.000-07:00
diff --git a/core_shape_datasource.go b/core_shape_datasource.go
@@ -9,9 +9,9 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-func ShapeDatasource() *schema.Resource {
+func InstanceShapeDatasource() *schema.Resource {
 	return &schema.Resource{
-		Read: readShape,
+		Read: readInstanceShape,
 		Schema: map[string]*schema.Schema{
 			"shapes": {
 				Type:     schema.TypeList,
@@ -49,9 +49,9 @@ func ShapeDatasource() *schema.Resource {
 	}
 }
 
-func readShape(d *schema.ResourceData, m interface{}) (e error) {
+func readInstanceShape(d *schema.ResourceData, m interface{}) (e error) {
 	client := m.(client.BareMetalClient)
-	reader := &ShapeDatasourceCrud{}
+	reader := &InstanceShapeDatasourceCrud{}
 	reader.D = d
 	reader.Client = client
 
diff --git a/core_shape_datasource_crud.go b/core_shape_datasource_crud.go
@@ -12,12 +12,12 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-type ShapeDatasourceCrud struct {
+type InstanceShapeDatasourceCrud struct {
 	crud.BaseCrud
 	Res *baremetal.ListShapes
 }
 
-func (r *ShapeDatasourceCrud) Get() (e error) {
+func (r *InstanceShapeDatasourceCrud) Get() (e error) {
 	compartmentID := r.D.Get("compartment_id").(string)
 
 	opts := &baremetal.ListShapesOptions{}
@@ -47,7 +47,7 @@ func (r *ShapeDatasourceCrud) Get() (e error) {
 	return
 }
 
-func (r *ShapeDatasourceCrud) SetData() {
+func (r *InstanceShapeDatasourceCrud) SetData() {
 	if r.Res != nil {
 		// Important, if you don't have an ID, make one up for your datasource
 		// or things will end in tears
diff --git a/identity_policy_datasource.go b/identity_policy_datasource.go
@@ -9,9 +9,9 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-func PolicyDatasource() *schema.Resource {
+func IdentityPolicyDatasource() *schema.Resource {
 	return &schema.Resource{
-		Read: readPolicies,
+		Read: readIdentityPolicies,
 		Schema: map[string]*schema.Schema{
 			"compartment_id": {
 				Type:     schema.TypeString,
@@ -26,9 +26,9 @@ func PolicyDatasource() *schema.Resource {
 	}
 }
 
-func readPolicies(d *schema.ResourceData, m interface{}) (e error) {
+func readIdentityPolicies(d *schema.ResourceData, m interface{}) (e error) {
 	client := m.(client.BareMetalClient)
-	sync := &PolicyDatasourceCrud{}
+	sync := &IdentityPolicyDatasourceCrud{}
 	sync.D = d
 	sync.Client = client
 	return crud.ReadResource(sync)
diff --git a/identity_policy_datasource_crud.go b/identity_policy_datasource_crud.go
@@ -10,19 +10,19 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-type PolicyDatasourceCrud struct {
+type IdentityPolicyDatasourceCrud struct {
 	crud.BaseCrud
 	Res *baremetal.ListPolicies
 }
 
-func (s *PolicyDatasourceCrud) Get() (e error) {
+func (s *IdentityPolicyDatasourceCrud) Get() (e error) {
 	compartment_id := s.D.Get("compartment_id").(string)
 
 	s.Res, e = s.Client.ListPolicies(compartment_id, nil)
 	return
 }
 
-func (s *PolicyDatasourceCrud) SetData() {
+func (s *IdentityPolicyDatasourceCrud) SetData() {
 	if s.Res != nil {
 		s.D.SetId(time.Now().UTC().String())
 		resources := []map[string]interface{}{}
diff --git a/loadbalancer_backend_datasource.go b/loadbalancer_backend_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_backend_datasource_crud.go b/loadbalancer_backend_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"time"
diff --git a/loadbalancer_backend_resource.go b/loadbalancer_backend_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_backend_resource_crud.go b/loadbalancer_backend_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/MustWin/baremetal-sdk-go"
diff --git a/loadbalancer_backend_set_resource.go b/loadbalancer_backend_set_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_backend_set_resource_crud.go b/loadbalancer_backend_set_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/MustWin/baremetal-sdk-go"
diff --git a/loadbalancer_backendset_datasource.go b/loadbalancer_backendset_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_backendset_datasource_crud.go b/loadbalancer_backendset_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"log"
diff --git a/loadbalancer_certificate_datasource.go b/loadbalancer_certificate_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_certificate_datasource_crud.go b/loadbalancer_certificate_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"time"
diff --git a/loadbalancer_certificate_resource.go b/loadbalancer_certificate_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_certificate_resource_crud.go b/loadbalancer_certificate_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/MustWin/baremetal-sdk-go"
diff --git a/loadbalancer_helpers.go b/loadbalancer_helpers.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import "github.com/hashicorp/terraform/helper/schema"
 
diff --git a/loadbalancer_listener_resource.go b/loadbalancer_listener_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_listener_resource_crud.go b/loadbalancer_listener_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"fmt"
diff --git a/loadbalancer_loadbalancer_datasource.go b/loadbalancer_loadbalancer_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_loadbalancer_datasource_crud.go b/loadbalancer_loadbalancer_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"log"
diff --git a/loadbalancer_loadbalancer_policy_datasource.go b/loadbalancer_loadbalancer_policy_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
@@ -9,7 +9,7 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-func PolicyDatasource() *schema.Resource {
+func LoadBalancerPolicyDatasource() *schema.Resource {
 	return &schema.Resource{
 		Read: readPolicies,
 		Schema: map[string]*schema.Schema{
diff --git a/loadbalancer_loadbalancer_policy_datasource_crud.go b/loadbalancer_loadbalancer_policy_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"time"
diff --git a/loadbalancer_loadbalancer_protocol_datasource.go b/loadbalancer_loadbalancer_protocol_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_loadbalancer_protocol_datasource_crud.go b/loadbalancer_loadbalancer_protocol_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"time"
diff --git a/loadbalancer_loadbalancer_resource.go b/loadbalancer_loadbalancer_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/loadbalancer_loadbalancer_resource_crud.go b/loadbalancer_loadbalancer_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"fmt"
diff --git a/loadbalancer_loadbalancer_shape_datasource.go b/loadbalancer_loadbalancer_shape_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
@@ -9,9 +9,9 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-func ShapeDatasource() *schema.Resource {
+func LoadBalancerShapeDatasource() *schema.Resource {
 	return &schema.Resource{
-		Read: readShapes,
+		Read: readLoadBalancerShapes,
 		Schema: map[string]*schema.Schema{
 			"compartment_id": {
 				Type:     schema.TypeString,
@@ -33,9 +33,9 @@ func ShapeDatasource() *schema.Resource {
 	}
 }
 
-func readShapes(d *schema.ResourceData, m interface{}) (e error) {
+func readLoadBalancerShapes(d *schema.ResourceData, m interface{}) (e error) {
 	client := m.(client.BareMetalClient)
-	sync := &ShapeDatasourceCrud{}
+	sync := &LoadBalancerShapeDatasourceCrud{}
 	sync.D = d
 	sync.Client = client
 	return crud.ReadResource(sync)
diff --git a/loadbalancer_loadbalancer_shape_datasource_crud.go b/loadbalancer_loadbalancer_shape_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package lb
+package main
 
 import (
 	"time"
@@ -10,18 +10,18 @@ import (
 	"github.com/oracle/terraform-provider-baremetal/crud"
 )
 
-type ShapeDatasourceCrud struct {
+type LoadBalancerShapeDatasourceCrud struct {
 	crud.BaseCrud
 	Res *baremetal.ListLoadBalancerShapes
 }
 
-func (s *ShapeDatasourceCrud) Get() (e error) {
+func (s *LoadBalancerShapeDatasourceCrud) Get() (e error) {
 	cID := s.D.Get("compartment_id").(string)
 	s.Res, e = s.Client.ListLoadBalancerShapes(cID, nil)
 	return
 }
 
-func (s *ShapeDatasourceCrud) SetData() {
+func (s *LoadBalancerShapeDatasourceCrud) SetData() {
 	if s.Res != nil {
 		s.D.SetId(time.Now().UTC().String())
 		resources := []map[string]interface{}{}
diff --git a/provider.go b/provider.go

Original file line number	Diff line number	Diff line change
`@@ -12,12 +12,12 @@ import (`
`12`	`12`	`"github.com/oracle/terraform-provider-baremetal/crud"`
`13`	`13`	`)`
`14`	`14`
`15`		`-type ShapeDatasourceCrud struct {`
	`15`	`+type InstanceShapeDatasourceCrud struct {`
`16`	`16`	`crud.BaseCrud`
`17`	`17`	`Res *baremetal.ListShapes`
`18`	`18`	`}`
`19`	`19`
`20`		`-func (r *ShapeDatasourceCrud) Get() (e error) {`
	`20`	`+func (r *InstanceShapeDatasourceCrud) Get() (e error) {`
`21`	`21`	`compartmentID := r.D.Get("compartment_id").(string)`
`22`	`22`
`23`	`23`	`opts := &baremetal.ListShapesOptions{}`
`@@ -47,7 +47,7 @@ func (r *ShapeDatasourceCrud) Get() (e error) {`
`47`	`47`	`return`
`48`	`48`	`}`
`49`	`49`
`50`		`-func (r *ShapeDatasourceCrud) SetData() {`
	`50`	`+func (r *InstanceShapeDatasourceCrud) SetData() {`
`51`	`51`	`if r.Res != nil {`
`52`	`52`	`// Important, if you don't have an ID, make one up for your datasource`
`53`	`53`	`// or things will end in tears`
Original file line number	Diff line number	Diff line change
`@@ -10,19 +10,19 @@ import (`
`10`	`10`	`"github.com/oracle/terraform-provider-baremetal/crud"`
`11`	`11`	`)`
`12`	`12`
`13`		`-type PolicyDatasourceCrud struct {`
	`13`	`+type IdentityPolicyDatasourceCrud struct {`
`14`	`14`	`crud.BaseCrud`
`15`	`15`	`Res *baremetal.ListPolicies`
`16`	`16`	`}`
`17`	`17`
`18`		`-func (s *PolicyDatasourceCrud) Get() (e error) {`
	`18`	`+func (s *IdentityPolicyDatasourceCrud) Get() (e error) {`
`19`	`19`	`compartment_id := s.D.Get("compartment_id").(string)`
`20`	`20`
`21`	`21`	`s.Res, e = s.Client.ListPolicies(compartment_id, nil)`
`22`	`22`	`return`
`23`	`23`	`}`
`24`	`24`
`25`		`-func (s *PolicyDatasourceCrud) SetData() {`
	`25`	`+func (s *IdentityPolicyDatasourceCrud) SetData() {`
`26`	`26`	`if s.Res != nil {`
`27`	`27`	`s.D.SetId(time.Now().UTC().String())`
`28`	`28`	`resources := []map[string]interface{}{}`