Merge pull request #177 from /issues/175

adding missing access_uri to schema #175

Author: rcohenma

docs/examples/storage/preauthrequests/preauthreq.tf

@@ -20,8 +20,6 @@ variable "bucket_name" {}
 variable "object_name" {}
 
 provider "baremetal" {
-  region = "us-phoenix-1"
-  alias = "phx"
   tenancy_ocid = "${var.tenancy_ocid}"
   user_ocid = "${var.user_ocid}"
   fingerprint = "${var.fingerprint}"
@@ -45,3 +43,11 @@ resource "baremetal_objectstorage_preauthrequest" "parOnObject" {
   access_type = "ObjectRead" //Other configurations accepted are ObjectWrite, ObjectReadWrite
   time_expires = "2019-11-10T23:00:00Z"
 }
+
+output "par_request_url" {
+  value = "${baremetal_objectstorage_preauthrequest.parOnObject.access_uri}"
+}
+
+output "par_request_name" {
+  value = "${baremetal_objectstorage_preauthrequest.parOnObject.name}"
+}

helpers_objectstorage.go

@@ -102,14 +102,18 @@ var preauthenticatedRequestSchema = map[string]*schema.Schema{
 	"access_type": {
 		Type:     schema.TypeString,
 		Computed: false,
-		Default:  baremetal.ObjectRead,
-		Optional: true,
+		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,

resource_obmcs_objectstorage_preauthenticatedrequest.go

@@ -15,6 +15,7 @@ import (
 type PreauthenticatedRequestResourceCrud struct {
 	crud.BaseCrud
 	Id          string
+	Name        string
 	Namespace   string
 	BucketName  string
 	ObjectName  string
@@ -76,7 +77,9 @@ func (s *PreauthenticatedRequestResourceCrud) SetData() {
 	s.D.Set("object", s.ObjectName)
 	s.D.Set("time_expires", s.TimeExpires.Format(time.RFC3339))
 	s.D.Set("access_type", s.AccessType)
+	s.D.Set("access_uri", s.AccessURI)
 	s.D.Set("id", s.ID)
+	s.D.Set("name", s.Name)
 }
 
 func (s *PreauthenticatedRequestResourceCrud) Create() (e error) {
@@ -111,6 +114,7 @@ func (s *PreauthenticatedRequestResourceCrud) Create() (e error) {
 	s.Namespace = namespace
 	s.BucketName = bucket
 	s.ObjectName = object
+	s.Name = res.Name
 	return
 }
 
@@ -128,13 +132,15 @@ func (s *PreauthenticatedRequestResourceCrud) Get() (e error) {
 	}
 
 	s.Id = res.ID
+	//Access URI is only accessible on create
 	s.AccessURI = ""
 	s.TimeCreated = res.TimeCreated
 	s.TimeExpires = res.TimeExpires
 	s.AccessType = res.AccessType
 	s.Namespace = namespace
 	s.BucketName = bucket
 	s.ObjectName = res.ObjectName
+	s.Name = res.Name
 
 	return
 }