Move objectstorage api into the main package

mikejihbe · codycushing · commit f7764bbb07f8 · 2017-05-14T15:46:33.000-07:00
diff --git a/core_instance_resource_crud.go b/core_instance_resource_crud.go
@@ -44,7 +44,7 @@ func (s *InstanceResourceCrud) DeletedTarget() []string {
 	return []string{baremetal.ResourceTerminated}
 }
 
-func resourceMapToMetadata(rm map[string]interface{}) map[string]string {
+func resourceInstanceMapToMetadata(rm map[string]interface{}) map[string]string {
 	result := map[string]string{}
 	for k, v := range rm {
 		result[k] = v.(string)
@@ -68,7 +68,7 @@ func (s *InstanceResourceCrud) Create() (e error) {
 	}
 
 	if rawMetadata, ok := s.D.GetOk("metadata"); ok {
-		metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))
+		metadata := resourceInstanceMapToMetadata(rawMetadata.(map[string]interface{}))
 		opts.Metadata = metadata
 	}
 
diff --git a/objectstorage_bucket_resource.go b/objectstorage_bucket_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/objectstorage_bucket_resource_crud.go b/objectstorage_bucket_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/MustWin/baremetal-sdk-go"
@@ -33,7 +33,7 @@ func (s *BucketResourceCrud) Create() (e error) {
 	opts := &baremetal.CreateBucketOptions{}
 
 	if rawMetadata, ok := s.D.GetOk("metadata"); ok {
-		metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))
+		metadata := resourceObjectStorageMapToMetadata(rawMetadata.(map[string]interface{}))
 		opts.Metadata = metadata
 	}
 	s.Res, e = s.Client.CreateBucket(compartmentID, name, baremetal.Namespace(namespace), opts)
@@ -53,7 +53,7 @@ func (s *BucketResourceCrud) Update() (e error) {
 	namespace := s.D.Get("namespace").(string)
 	opts := &baremetal.UpdateBucketOptions{}
 	if rawMetadata, ok := s.D.GetOk("metadata"); ok {
-		metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))
+		metadata := resourceObjectStorageMapToMetadata(rawMetadata.(map[string]interface{}))
 		opts.Metadata = metadata
 	}
 
diff --git a/objectstorage_bucketsummary_datasource.go b/objectstorage_bucketsummary_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/objectstorage_bucketsummary_datasource_crud.go b/objectstorage_bucketsummary_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"time"
diff --git a/objectstorage_helpers.go b/objectstorage_helpers.go
@@ -1,10 +1,10 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import "github.com/hashicorp/terraform/helper/schema"
 
-func resourceMapToMetadata(rm map[string]interface{}) map[string]string {
+func resourceObjectStorageMapToMetadata(rm map[string]interface{}) map[string]string {
 	result := map[string]string{}
 	for k, v := range rm {
 		result[k] = v.(string)
diff --git a/objectstorage_namespace_datasource.go b/objectstorage_namespace_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/objectstorage_namespace_datasource_crud.go b/objectstorage_namespace_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"time"
diff --git a/objectstorage_object_datasource.go b/objectstorage_object_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/objectstorage_object_datasource_crud.go b/objectstorage_object_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"time"
diff --git a/objectstorage_object_head_datasource.go b/objectstorage_object_head_datasource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/objectstorage_object_head_datasource_crud.go b/objectstorage_object_head_datasource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"time"
diff --git a/objectstorage_object_resource.go b/objectstorage_object_resource.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/hashicorp/terraform/helper/schema"
diff --git a/objectstorage_object_resource_crud.go b/objectstorage_object_resource_crud.go
@@ -1,6 +1,6 @@
 // Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
 
-package objectstorage
+package main
 
 import (
 	"github.com/MustWin/baremetal-sdk-go"
@@ -46,7 +46,7 @@ func (s *ObjectResourceCrud) Update() (e error) {
 	opts := &baremetal.PutObjectOptions{}
 
 	if rawMetadata, ok := s.D.GetOk("metadata"); ok {
-		metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))
+		metadata := resourceObjectStorageMapToMetadata(rawMetadata.(map[string]interface{}))
 		opts.Metadata = metadata
 	}
 	s.Res, e = s.Client.PutObject(baremetal.Namespace(namespace), bucket, object, []byte(content), opts)
diff --git a/provider.go b/provider.go
@@ -11,9 +11,7 @@ import (
 	"github.com/hashicorp/terraform/helper/schema"
 	"github.com/hashicorp/terraform/terraform"
 
-	"github.com/oracle/terraform-provider-baremetal/identity"
 	"github.com/oracle/terraform-provider-baremetal/lb"
-	"github.com/oracle/terraform-provider-baremetal/objectstorage"
 )
 
 var descriptions map[string]string
@@ -115,25 +113,25 @@ func dataSourcesMap() map[string]*schema.Resource {
 		"baremetal_database_db_systems":             DBSystemDatasource(),
 		"baremetal_database_db_versions":            DBVersionDatasource(),
 		"baremetal_database_supported_operations":   SupportedOperationDatasource(),
-		"baremetal_identity_api_keys":               identity.APIKeyDatasource(),
-		"baremetal_identity_availability_domains":   identity.AvailabilityDomainDatasource(),
-		"baremetal_identity_compartments":           identity.CompartmentDatasource(),
-		"baremetal_identity_groups":                 identity.GroupDatasource(),
-		"baremetal_identity_policies":               identity.PolicyDatasource(),
-		"baremetal_identity_swift_passwords":        identity.SwiftPasswordDatasource(),
-		"baremetal_identity_user_group_memberships": identity.UserGroupMembershipDatasource(),
-		"baremetal_identity_users":                  identity.UserDatasource(),
+		"baremetal_identity_api_keys":               APIKeyDatasource(),
+		"baremetal_identity_availability_domains":   AvailabilityDomainDatasource(),
+		"baremetal_identity_compartments":           CompartmentDatasource(),
+		"baremetal_identity_groups":                 GroupDatasource(),
+		"baremetal_identity_policies":               PolicyDatasource(),
+		"baremetal_identity_swift_passwords":        SwiftPasswordDatasource(),
+		"baremetal_identity_user_group_memberships": UserGroupMembershipDatasource(),
+		"baremetal_identity_users":                  UserDatasource(),
 		"baremetal_load_balancer_backends":          lb.BackendDatasource(),
 		"baremetal_load_balancer_backendsets":       lb.BackendSetDatasource(),
 		"baremetal_load_balancer_certificates":      lb.CertificateDatasource(),
 		"baremetal_load_balancer_policies":          lb.PolicyDatasource(),
 		"baremetal_load_balancer_protocols":         lb.ProtocolDatasource(),
 		"baremetal_load_balancer_shapes":            lb.ShapeDatasource(),
 		"baremetal_load_balancers":                  lb.LoadBalancerDatasource(),
-		"baremetal_objectstorage_bucket_summaries":  objectstorage.BucketSummaryDatasource(),
-		"baremetal_objectstorage_namespace":         objectstorage.NamespaceDatasource(),
-		"baremetal_objectstorage_object_head":       objectstorage.ObjectHeadDatasource(),
-		"baremetal_objectstorage_objects":           objectstorage.ObjectDatasource(),
+		"baremetal_objectstorage_bucket_summaries":  BucketSummaryDatasource(),
+		"baremetal_objectstorage_namespace":         NamespaceDatasource(),
+		"baremetal_objectstorage_object_head":       ObjectHeadDatasource(),
+		"baremetal_objectstorage_objects":           ObjectDatasource(),
 	}
 }
 
@@ -156,21 +154,21 @@ func resourcesMap() map[string]*schema.Resource {
 		"baremetal_core_volume_attachment":         VolumeAttachmentResource(),
 		"baremetal_core_volume_backup":             VolumeBackupResource(),
 		"baremetal_database_db_system":             DBSystemResource(),
-		"baremetal_identity_api_key":               identity.APIKeyResource(),
-		"baremetal_identity_compartment":           identity.CompartmentResource(),
-		"baremetal_identity_group":                 identity.GroupResource(),
-		"baremetal_identity_policy":                identity.PolicyResource(),
-		"baremetal_identity_swift_password":        identity.SwiftPasswordResource(),
-		"baremetal_identity_ui_password":           identity.UIPasswordResource(),
-		"baremetal_identity_user":                  identity.UserResource(),
-		"baremetal_identity_user_group_membership": identity.UserGroupMembershipResource(),
+		"baremetal_identity_api_key":               APIKeyResource(),
+		"baremetal_identity_compartment":           CompartmentResource(),
+		"baremetal_identity_group":                 GroupResource(),
+		"baremetal_identity_policy":                PolicyResource(),
+		"baremetal_identity_swift_password":        SwiftPasswordResource(),
+		"baremetal_identity_ui_password":           UIPasswordResource(),
+		"baremetal_identity_user":                  UserResource(),
+		"baremetal_identity_user_group_membership": UserGroupMembershipResource(),
 		"baremetal_load_balancer":                  lb.LoadBalancerResource(),
 		"baremetal_load_balancer_backend":          lb.LoadBalancerBackendResource(),
 		"baremetal_load_balancer_backendset":       lb.LoadBalancerBackendSetResource(),
 		"baremetal_load_balancer_certificate":      lb.LoadBalancerCertificateResource(),
 		"baremetal_load_balancer_listener":         lb.LoadBalancerListenerResource(),
-		"baremetal_objectstorage_bucket":           objectstorage.BucketResource(),
-		"baremetal_objectstorage_object":           objectstorage.ObjectResource(),
+		"baremetal_objectstorage_bucket":           BucketResource(),
+		"baremetal_objectstorage_object":           ObjectResource(),
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ func (s *InstanceResourceCrud) DeletedTarget() []string {`
`44`	`44`	`return []string{baremetal.ResourceTerminated}`
`45`	`45`	`}`
`46`	`46`
`47`		`-func resourceMapToMetadata(rm map[string]interface{}) map[string]string {`
	`47`	`+func resourceInstanceMapToMetadata(rm map[string]interface{}) map[string]string {`
`48`	`48`	`result := map[string]string{}`
`49`	`49`	`for k, v := range rm {`
`50`	`50`	`result[k] = v.(string)`
`@@ -68,7 +68,7 @@ func (s *InstanceResourceCrud) Create() (e error) {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if rawMetadata, ok := s.D.GetOk("metadata"); ok {`
`71`		`- metadata := resourceMapToMetadata(rawMetadata.(map[string]interface{}))`
	`71`	`+ metadata := resourceInstanceMapToMetadata(rawMetadata.(map[string]interface{}))`
`72`	`72`	`opts.Metadata = metadata`
`73`	`73`	`}`
`74`	`74`