more PR feedback

yougroupteam · Apr 18, 2018 · fba737e · fba737e
1 parent 1e82fec
commit fba737e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/buildkite/data_source_pipelines_test.go b/buildkite/data_source_pipelines_test.go
@@ -38,11 +38,11 @@ resource buildkite_pipeline "test" {
   description  = "Generated via acceptance tests - please delete if left dangling"
   repository   = "[email protected]:COzero/terraform-provider-buildkite.git"
 
-  step {
+  steps = [{
     type    = "script"
     name    = "Hi!"
     command = "echo \"Hello world\""
-  }
+  }]
 }
 
 data buildkite_pipeline "test" {

diff --git a/buildkite/helpers.go b/buildkite/helpers.go
@@ -5,7 +5,7 @@ func String(v string) *string {
 	return &v
 }
 
-// StringValue returns the value of a string pointer or "" if the pointer is nil
+// StringValue deferences a pointer to a string or returns "" if the pointer is nil
 func StringValue(v *string) string {
 	if v != nil {
 		return *v

diff --git a/buildkite/resource_pipeline.go b/buildkite/resource_pipeline.go
@@ -30,8 +30,8 @@ func resourcePipeline() *schema.Resource {
 				Type:     schema.TypeString,
 				Required: true,
 			},
-			"step": &schema.Schema{
-				Type:     schema.TypeSet,
+			"steps": &schema.Schema{
+				Type:     schema.TypeList,
 				Required: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
@@ -188,7 +188,7 @@ func resourcePipelineCreate(d *schema.ResourceData, meta interface{}) error {
 
 	updatePipelineFromAPI(d, pipe)
 
-	return resourcePipelineRead(d, meta)
+	return nil
 }
 
 func resourcePipelineRead(d *schema.ResourceData, meta interface{}) error {
@@ -254,7 +254,7 @@ func resourcePipelineUpdate(d *schema.ResourceData, meta interface{}) error {
 
 	updatePipelineFromAPI(d, pipe)
 
-	return resourcePipelineRead(d, meta)
+	return nil
 }
 
 func resourcePipelineDelete(d *schema.ResourceData, meta interface{}) error {
@@ -283,7 +283,7 @@ func buildPipelineInput(d *schema.ResourceData) *buildkite.CreatePipeline {
 		TeamUuids:                       []string{},
 	}
 
-	steps := d.Get("step").(*schema.Set).List()
+	steps := d.Get("steps").([]interface{})
 	input.Steps = make([]buildkite.Step, len(steps))
 
 	for i, s := range steps {

diff --git a/buildkite/resource_pipeline_test.go b/buildkite/resource_pipeline_test.go
@@ -44,11 +44,11 @@ resource buildkite_pipeline "test" {
   description  = "Generated via acceptance tests - please delete if left dangling"
   repository   = "[email protected]:COzero/terraform-provider-buildkite.git"
 
-  step {
+  steps = [{
     type    = "script"
     name    = "Hi!"
     command = "echo \"Hello world\""
-  }
+  }]
 }
 `, rStr)
 }