feat(upsert_pipeline): Prepare plank for adding ff when upserting pip…

…eline. (#88)

* feat(upsert_pipeline): Prepare plank for adding ff when upserting pipeline.

* feat(upsert_pipeline): Prepare plank for adding ff when upserting pipeline.

CHANGELOG.md

@@ -7,7 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-- Using gate when upserting pipeline
+- Adding back old upsertPipeline implementation.
+- To be used in ff logic in dinghy.
+
+### Fixed
+
+### Removed
+
+## [4.1.1]
+
+### Added
+- Using orca when upserting pipeline
 
 ### Fixed
 

pipelines.go

@@ -152,7 +152,34 @@ func (c *Client) GetPipelines(app, traceparent string) ([]Pipeline, error) {
 }
 
 // UpsertPipeline creates/updates a pipeline defined in the struct argument.
+
 func (c *Client) UpsertPipeline(p Pipeline, id, traceparent string) error {
+	var unused interface{}
+	if id == "" {
+		if c.UseGate {
+			if err := c.PostWithRetry(c.gatePipelinesURL(), traceparent, ApplicationJson, p, &unused); err != nil {
+				return fmt.Errorf("could not create pipeline '%s' in app '%s': %w", p.Name, p.Application, err)
+			}
+		} else {
+			if err := c.PostWithRetry(c.pipelinesURL(), traceparent, ApplicationJson, p, &unused); err != nil {
+				return fmt.Errorf("could not create pipeline '%s' in app '%s': %w", p.Name, p.Application, err)
+			}
+		}
+	} else {
+		if c.UseGate {
+			if err := c.PutWithRetry(fmt.Sprintf("%s/%s", c.gatePipelinesURL(), id), traceparent, ApplicationJson, p, &unused); err != nil {
+				return fmt.Errorf("could not update pipeline '%s' in app '%s': %w", p.Name, p.Application, err)
+			}
+		} else {
+			if err := c.PutWithRetry(fmt.Sprintf("%s/%s", c.pipelinesURL(), id), traceparent, ApplicationJson, p, &unused); err != nil {
+				return fmt.Errorf("could not update pipeline '%s' in app '%s': %w", p.Name, p.Application, err)
+			}
+		}
+	}
+	return nil
+}
+
+func (c *Client) UpsertPipelineUsingOrca(p Pipeline, id, traceparent string) error {
 	var resultMap map[string]interface{}
 	operation := getOperation(p, id)
 	if err := c.PostWithRetry(c.URLs["orca"]+"/ops", traceparent, ApplicationContextJson, operation, &resultMap); err != nil {

pipelines_test.go

@@ -58,7 +58,73 @@ func TestGetPipelinesWithGate(t *testing.T) {
 	assert.Equal(t, len(val), 0) // Should get 0 pipelines back.
 }
 
+func TestUpsertPipelinesNoIdWithGate(t *testing.T) {
+	client := NewTestClient(func(req *http.Request) *http.Response {
+		assert.Equal(t, req.URL.String(), "http://localhost:8084/plank/pipelines")
+		assert.Equal(t, req.Method, "POST")
+		return &http.Response{
+			StatusCode: 200,
+			Body:       ioutil.NopCloser(bytes.NewBufferString("[]")),
+			Header:     make(http.Header),
+		}
+	})
+
+	c := New(WithClient(client))
+	c.UseGateEndpoints()
+	err := c.UpsertPipeline(Pipeline{}, "", "")
+	assert.Nil(t, err)
+}
+
+func TestUpsertPipelinesWithGate(t *testing.T) {
+	client := NewTestClient(func(req *http.Request) *http.Response {
+		assert.Equal(t, req.URL.String(), "http://localhost:8084/plank/pipelines/Test")
+		assert.Equal(t, req.Method, "PUT")
+		return &http.Response{
+			StatusCode: 200,
+			Body:       ioutil.NopCloser(bytes.NewBufferString("[]")),
+			Header:     make(http.Header),
+		}
+	})
+
+	c := New(WithClient(client))
+	c.UseGateEndpoints()
+	err := c.UpsertPipeline(Pipeline{}, "Test", "")
+	assert.Nil(t, err)
+}
+
 func TestUpsertPipelines(t *testing.T) {
+	client := NewTestClient(func(req *http.Request) *http.Response {
+		assert.Equal(t, req.URL.String(), "http://localhost:8080/pipelines/Test")
+		assert.Equal(t, req.Method, "PUT")
+		return &http.Response{
+			StatusCode: 200,
+			Body:       ioutil.NopCloser(bytes.NewBufferString("[]")),
+			Header:     make(http.Header),
+		}
+	})
+
+	c := New(WithClient(client))
+	err := c.UpsertPipeline(Pipeline{}, "Test", "")
+	assert.Nil(t, err)
+}
+
+func TestUpsertPipelinesNoId(t *testing.T) {
+	client := NewTestClient(func(req *http.Request) *http.Response {
+		assert.Equal(t, req.URL.String(), "http://localhost:8080/pipelines")
+		assert.Equal(t, req.Method, "POST")
+		return &http.Response{
+			StatusCode: 200,
+			Body:       ioutil.NopCloser(bytes.NewBufferString("[]")),
+			Header:     make(http.Header),
+		}
+	})
+
+	c := New(WithClient(client))
+	err := c.UpsertPipeline(Pipeline{}, "", "")
+	assert.Nil(t, err)
+}
+
+func TestUpsertPipelinesUsingGate(t *testing.T) {
 	client := NewTestClient(func(req *http.Request) *http.Response {
 		responseJSON := `{
 		  "status": "SUCCEEDED",
@@ -77,11 +143,11 @@ func TestUpsertPipelines(t *testing.T) {
 	})
 
 	c := New(WithClient(client))
-	err := c.UpsertPipeline(Pipeline{}, "Test", "")
+	err := c.UpsertPipelineUsingOrca(Pipeline{}, "Test", "")
 	assert.Nil(t, err)
 }
 
-func TestUpsertPipelinesNoId(t *testing.T) {
+func TestUpsertPipelinesUsingGateNoId(t *testing.T) {
 	client := NewTestClient(func(req *http.Request) *http.Response {
 		responseJSON := `{
 		  "status": "SUCCEEDED",
@@ -100,7 +166,7 @@ func TestUpsertPipelinesNoId(t *testing.T) {
 	})
 
 	c := New(WithClient(client))
-	err := c.UpsertPipeline(Pipeline{}, "", "")
+	err := c.UpsertPipelineUsingOrca(Pipeline{}, "", "")
 	assert.Nil(t, err)
 }