Skip to content

Commit ab52a88

Browse files
palson-cfpalson-cf
committed
Add 'CODEFRESH_API_URL' env var
1 parent 17fe7e1 commit ab52a88

8 files changed

+31
-24
lines changed

‎go.sum‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -384,6 +384,7 @@ golang.org/x/sys v0.0.0-20190502175342-a43fa875dd82/go.mod h1:h1NjWce9XRLGQEsW7w
384384
golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
385385
golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
386386
golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
387+
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa h1:KIDDMLT1O0Nr7TSxp8xM5tJcdn8tgyAONntO829og1M=
387388
golang.org/x/sys v0.0.0-20190804053845-51ab0e2deafa/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
388389
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
389390
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=

‎resource_cron_event.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func resourceCronEvent() *schema.Resource {
9494

9595
func resourceCronEventCreate(d *schema.ResourceData, _ interface{}) error {
9696
return createCodefreshObject(
97-
fmt.Sprintf("%v/hermes/events", codefreshURL),
97+
fmt.Sprintf("%v/hermes/events", getCfUrl()),
9898
"POST",
9999
d,
100100
mapResourceToCronEvent,
@@ -112,7 +112,7 @@ func resourceCronEventRead(d *schema.ResourceData, _ interface{}) error {
112112
// TODO: I don't think this is actually deleting anything, I have an open ticket with Codefresh
113113
// https://support.codefresh.io/hc/en-us/requests/3167?page=1
114114
func resourceCronEventDelete(d *schema.ResourceData, _ interface{}) error {
115-
cfURL := fmt.Sprintf("%v/hermes/events/%v", codefreshURL, urlEncode(d.Id()))
115+
cfURL := fmt.Sprintf("%v/hermes/events/%v", getCfUrl(), urlEncode(d.Id()))
116116
return deleteCodefreshObject(cfURL)
117117
}
118118

@@ -167,7 +167,7 @@ func readCronEvent(_ *schema.ResourceData, b []byte) (codefreshObject, error) {
167167
func getCronEventFromCodefresh(d *schema.ResourceData) (codefreshObject, error) {
168168
// get the event
169169
event := d.Id()
170-
cfURL := fmt.Sprintf("%v/hermes/events/%v", codefreshURL, urlEncode(event))
170+
cfURL := fmt.Sprintf("%v/hermes/events/%v", getCfUrl(), urlEncode(event))
171171
return getFromCodefresh(d, cfURL, readCronEvent)
172172
}
173173

‎resource_cron_trigger.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func resourceCronTrigger() *schema.Resource {
4040

4141
func resourceCronTriggerCreate(d *schema.ResourceData, _ interface{}) error {
4242
return createCodefreshObject(
43-
fmt.Sprintf("%v/hermes/triggers/%v/%v", codefreshURL, urlEncode(d.Get("event").(string)), d.Get("pipeline")),
43+
fmt.Sprintf("%v/hermes/triggers/%v/%v", getCfUrl(), urlEncode(d.Get("event").(string)), d.Get("pipeline")),
4444
"POST",
4545
d,
4646
mapResourceToCronTrigger,
@@ -58,7 +58,7 @@ func resourceCronTriggerRead(d *schema.ResourceData, _ interface{}) error {
5858
// TODO: I don't think this is actually deleting anything, I have an open ticket with Codefresh
5959
// https://support.codefresh.io/hc/en-us/requests/3167?page=1
6060
func resourceCronTriggerDelete(d *schema.ResourceData, _ interface{}) error {
61-
cfURL := fmt.Sprintf("%v/hermes/triggers/%v/%v", codefreshURL, urlEncode(d.Get("event").(string)), d.Get("pipeline"))
61+
cfURL := fmt.Sprintf("%v/hermes/triggers/%v/%v", getCfUrl(), urlEncode(d.Get("event").(string)), d.Get("pipeline"))
6262
return deleteCodefreshObject(cfURL)
6363
}
6464

@@ -103,7 +103,7 @@ func readCronTrigger(_ *schema.ResourceData, b []byte) (codefreshObject, error)
103103
func getCronTriggerFromCodefresh(d *schema.ResourceData) (codefreshObject, error) {
104104
pipeline := d.Id()
105105
// get the trigger
106-
cfURL := fmt.Sprintf("%v/hermes/triggers/pipeline/%v", codefreshURL, pipeline)
106+
cfURL := fmt.Sprintf("%v/hermes/triggers/pipeline/%v", getCfUrl(), pipeline)
107107
return getFromCodefresh(d, cfURL, readCronTrigger)
108108
}
109109

‎resource_environment.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ func resourceEnvironment() *schema.Resource {
7575

7676
func resourceEnvironmentCreate(d *schema.ResourceData, _ interface{}) error {
7777
return createCodefreshObject(
78-
fmt.Sprintf("%v/environments-v2", codefreshURL),
78+
fmt.Sprintf("%v/environments-v2", getCfUrl()),
7979
"POST",
8080
d,
8181
mapResourceToEnvironment,
@@ -91,7 +91,7 @@ func resourceEnvironmentRead(d *schema.ResourceData, _ interface{}) error {
9191
}
9292

9393
func resourceEnvironmentUpdate(d *schema.ResourceData, _ interface{}) error {
94-
url := fmt.Sprintf("%v/environments-v2/%v", codefreshURL, d.Id())
94+
url := fmt.Sprintf("%v/environments-v2/%v", getCfUrl(), d.Id())
9595
return updateCodefreshObject(
9696
d,
9797
url,
@@ -102,7 +102,7 @@ func resourceEnvironmentUpdate(d *schema.ResourceData, _ interface{}) error {
102102
}
103103

104104
func resourceEnvironmentDelete(d *schema.ResourceData, _ interface{}) error {
105-
url := fmt.Sprintf("%v/environments-v2/%v", codefreshURL, d.Id())
105+
url := fmt.Sprintf("%v/environments-v2/%v", getCfUrl(), d.Id())
106106
return deleteCodefreshObject(url)
107107
}
108108

@@ -124,7 +124,7 @@ func readEnvironment(_ *schema.ResourceData, b []byte) (codefreshObject, error)
124124

125125
func getEnvironmentFromCodefresh(d *schema.ResourceData) (codefreshObject, error) {
126126
id := d.Id()
127-
url := fmt.Sprintf("%v/environments-v2/%v", codefreshURL, id)
127+
url := fmt.Sprintf("%v/environments-v2/%v", getCfUrl(), id)
128128
return getFromCodefresh(d, url, readEnvironment)
129129
}
130130

‎resource_pipeline.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ func resourcePipeline() *schema.Resource {
210210

211211
func resourcePipelineCreate(d *schema.ResourceData, _ interface{}) error {
212212
return createCodefreshObject(
213-
fmt.Sprintf("%v/pipelines", codefreshURL),
213+
fmt.Sprintf("%v/pipelines", getCfUrl()),
214214
"POST",
215215
d,
216216
mapResourceToPipeline,
@@ -223,7 +223,7 @@ func resourcePipelineRead(d *schema.ResourceData, _ interface{}) error {
223223
}
224224

225225
func resourcePipelineUpdate(d *schema.ResourceData, _ interface{}) error {
226-
url := fmt.Sprintf("%v/pipelines/%v?disableRevisionCheck=true", codefreshURL, d.Id())
226+
url := fmt.Sprintf("%v/pipelines/%v?disableRevisionCheck=true", getCfUrl(), d.Id())
227227
return updateCodefreshObject(
228228
d,
229229
url,
@@ -234,7 +234,7 @@ func resourcePipelineUpdate(d *schema.ResourceData, _ interface{}) error {
234234
}
235235

236236
func resourcePipelineDelete(d *schema.ResourceData, _ interface{}) error {
237-
url := fmt.Sprintf("%v/pipelines/%v", codefreshURL, d.Id())
237+
url := fmt.Sprintf("%v/pipelines/%v", getCfUrl(), d.Id())
238238
return deleteCodefreshObject(url)
239239
}
240240

@@ -256,7 +256,7 @@ func readPipeline(_ *schema.ResourceData, b []byte) (codefreshObject, error) {
256256

257257
func getPipelineFromCodefresh(d *schema.ResourceData) (codefreshObject, error) {
258258
pipelineName := d.Id()
259-
url := fmt.Sprintf("%v/pipelines/%v", codefreshURL, pipelineName)
259+
url := fmt.Sprintf("%v/pipelines/%v", getCfUrl(), pipelineName)
260260
return getFromCodefresh(d, url, readPipeline)
261261
}
262262

‎resource_project.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package main
33
import (
44
"encoding/json"
55
"fmt"
6+
67
"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
78
)
89

@@ -57,7 +58,7 @@ func resourceProject() *schema.Resource {
5758

5859
func resourceProjectCreate(d *schema.ResourceData, _ interface{}) error {
5960
return createCodefreshObject(
60-
fmt.Sprintf("%v/projects", codefreshURL),
61+
fmt.Sprintf("%v/projects", getCfUrl()),
6162
"POST",
6263
d,
6364
mapResourceToProject,
@@ -73,7 +74,7 @@ func resourceProjectRead(d *schema.ResourceData, _ interface{}) error {
7374
}
7475

7576
func resourceProjectUpdate(d *schema.ResourceData, _ interface{}) error {
76-
url := fmt.Sprintf("%v/projects/%v", codefreshURL, d.Id())
77+
url := fmt.Sprintf("%v/projects/%v", getCfUrl(), d.Id())
7778
return updateCodefreshObject(
7879
d,
7980
url,
@@ -84,7 +85,7 @@ func resourceProjectUpdate(d *schema.ResourceData, _ interface{}) error {
8485
}
8586

8687
func resourceProjectDelete(d *schema.ResourceData, _ interface{}) error {
87-
url := fmt.Sprintf("%v/projects/%v", codefreshURL, d.Id())
88+
url := fmt.Sprintf("%v/projects/%v", getCfUrl(), d.Id())
8889
return deleteCodefreshObject(url)
8990
}
9091

@@ -106,7 +107,7 @@ func readProject(_ *schema.ResourceData, b []byte) (codefreshObject, error) {
106107

107108
func getProjectFromCodefresh(d *schema.ResourceData) (codefreshObject, error) {
108109
projectName := d.Id()
109-
url := fmt.Sprintf("%v/projects/name/%v", codefreshURL, projectName)
110+
url := fmt.Sprintf("%v/projects/name/%v", getCfUrl(), projectName)
110111
return getFromCodefresh(d, url, readProject)
111112
}
112113

‎resource_user.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func resourceUser() *schema.Resource {
4747

4848
func resourceUserCreate(d *schema.ResourceData, _ interface{}) error {
4949
return createCodefreshObject(
50-
fmt.Sprintf("%v/accounts/%s/adduser", codefreshURL, codefreshAccountID),
50+
fmt.Sprintf("%v/accounts/%s/adduser", getCfUrl(), codefreshAccountID),
5151
"POST",
5252
d,
5353
mapResourceToUser,
@@ -63,7 +63,7 @@ func resourceUserRead(d *schema.ResourceData, _ interface{}) error {
6363
}
6464

6565
func resourceUserDelete(d *schema.ResourceData, _ interface{}) error {
66-
url := fmt.Sprintf("%v/accounts/%v/%v", codefreshURL, codefreshAccountID, d.Id())
66+
url := fmt.Sprintf("%v/accounts/%v/%v", getCfUrl(), codefreshAccountID, d.Id())
6767
return deleteCodefreshObject(url)
6868
}
6969

@@ -85,7 +85,7 @@ func readUserCreate(_ *schema.ResourceData, b []byte) (codefreshObject, error) {
8585
}
8686

8787
func getUserFromCodefresh(d *schema.ResourceData) (codefreshObject, error) {
88-
url := fmt.Sprintf("%v/accounts/%v/users", codefreshURL, codefreshAccountID)
88+
url := fmt.Sprintf("%v/accounts/%v/users", getCfUrl(), codefreshAccountID)
8989
return getFromCodefresh(d, url, readUserFromAll)
9090
}
9191

‎utils.go‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,14 @@ import (
1111
"strings"
1212
)
1313

14-
const (
15-
codefreshURL = "https://g.codefresh.io/api"
16-
)
14+
func getCfUrl() string {
15+
if cfUrl := os.Getenv("CODEFRESH_API_URL"); cfUrl != "" {
16+
return cfUrl
17+
} else {
18+
return "https://g.codefresh.io/api"
19+
}
20+
21+
}
1722

1823
type codefreshObject interface {
1924
getID() string

0 commit comments

Comments
 (0)