No change in functionality. Code organization changed to make schema definition standardized (#397)

Author: rohanbhattacharjee

provider/helpers_identity.go

@@ -2,95 +2,10 @@
 
 package provider
 
-import (
-	"github.com/hashicorp/terraform/helper/schema"
-	"github.com/hashicorp/terraform/helper/validation"
-	"github.com/oracle/bmcs-go-sdk"
-)
-
 func resourceObjectStorageMapToMetadata(rm map[string]interface{}) map[string]string {
 	result := map[string]string{}
 	for k, v := range rm {
 		result[k] = v.(string)
 	}
 	return result
 }
-
-var bucketSchema = map[string]*schema.Schema{
-	"compartment_id": {
-		Type:     schema.TypeString,
-		Required: true,
-		Computed: false,
-	},
-	"name": {
-		Type:     schema.TypeString,
-		Required: true,
-		Computed: false,
-	},
-	"namespace": {
-		Type:     schema.TypeString,
-		Required: true,
-		Computed: false,
-	},
-	"access_type": {
-		Type:     schema.TypeString,
-		Computed: false,
-		Default:  baremetal.NoPublicAccess,
-		Optional: true,
-		ValidateFunc: validation.StringInSlice([]string{
-			string(baremetal.NoPublicAccess),
-			string(baremetal.ObjectRead)}, true),
-	},
-	"metadata": {
-		Type:     schema.TypeMap,
-		Optional: true,
-	},
-}
-
-var preauthenticatedRequestSchema = map[string]*schema.Schema{
-	"id": {
-		Type:     schema.TypeString,
-		Optional: true,
-		Computed: true,
-	},
-	"namespace": {
-		Type:     schema.TypeString,
-		Required: true,
-		Computed: false,
-	},
-	"name": {
-		Type:     schema.TypeString,
-		Required: true,
-		Computed: false,
-	},
-	"bucket": {
-		Type:     schema.TypeString,
-		Required: true,
-		Computed: false,
-	},
-	"object": {
-		Type:     schema.TypeString,
-		Optional: true,
-		Computed: false,
-	},
-	"access_type": {
-		Type:     schema.TypeString,
-		Computed: false,
-		Required: true,
-		ValidateFunc: validation.StringInSlice([]string{
-			string(baremetal.PARAnyObjectWrite),
-			string(baremetal.PARObjectRead),
-			string(baremetal.PARObjectReadWrite),
-			string(baremetal.ObjectRead)}, true),
-	},
-	"access_uri": {
-		Type:     schema.TypeString,
-		Computed: true,
-		Optional: true,
-	},
-	"time_expires": {
-		Type:     schema.TypeString,
-		Computed: false,
-		Required: true,
-	},
-}

provider/helpers_objectstorage.go

@@ -15,41 +15,6 @@ import (
 
 // ResourceIdentityCompartment exposes an IdentityCompartment Resource
 func CompartmentResource() *schema.Resource {
-	compartmentSchema := map[string]*schema.Schema{
-		"id": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"name": {
-			Type:     schema.TypeString,
-			Required: true,
-		},
-		"description": {
-			Type:     schema.TypeString,
-			Required: true,
-		},
-		"compartment_id": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"state": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"inactive_state": {
-			Type:     schema.TypeInt,
-			Computed: true,
-		},
-		"time_created": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-		"time_modified": {
-			Type:     schema.TypeString,
-			Computed: true,
-		},
-	}
-
 	return &schema.Resource{
 		Importer: &schema.ResourceImporter{
 			State: schema.ImportStatePassthrough,
@@ -59,7 +24,40 @@ func CompartmentResource() *schema.Resource {
 		Read:     readCompartment,
 		Update:   updateCompartment,
 		Delete:   deleteCompartment,
-		Schema:   compartmentSchema,
+		Schema: map[string]*schema.Schema{
+			"id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"inactive_state": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"time_created": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"time_modified": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
 	}
 }
 

provider/identity_compartment_resource.go

@@ -22,7 +22,42 @@ func GroupResource() *schema.Resource {
 		Read:     readGroup,
 		Update:   updateGroup,
 		Delete:   deleteGroup,
-		Schema:   baseIdentitySchema,
+		Schema: map[string]*schema.Schema{
+			"id": {
+				Type:     schema.TypeString,
+				Computed: true,
+				ForceNew: true,
+			},
+			"name": {
+				Type:     schema.TypeString,
+				Required: true,
+				ForceNew: true,
+			},
+			"description": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"compartment_id": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"state": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"inactive_state": {
+				Type:     schema.TypeInt,
+				Computed: true,
+			},
+			"time_created": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"time_modified": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+		},
 	}
 }