maxmustermann/pulumi
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Canonicalize where we use the Pulumi API (#556)

Browse source 
Canonicalize the value we get from `PULUMI_API`. Fixes #555 .
This commit is contained in:
Chris Smith 2017-11-13 18:25:57 -08:00 committed by GitHub
parent d39be9e55b
commit f74d418b99
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cmd/api.go
View file

@ -9,6 +9,7 @@ import (
"io/ioutil"
"net/http"
"os"
"strings"
"github.com/pulumi/pulumi/pkg/apitype"
"github.com/pulumi/pulumi/pkg/tokens"
@ -22,7 +23,7 @@ func pulumiConsoleAPI() (string, error) {
if envVar == "" {
return "", fmt.Errorf("PULUMI_API env var not set")
}
return envVar, nil
return strings.TrimSuffix(envVar, "/"), nil
}
// usePulumiCloudCommands returns whether or not to use the "Pulumi Cloud" version of CLI commands.
@ -46,7 +47,11 @@ func pulumiAPICall(method string, path string, body []byte, accessToken string)
return nil, fmt.Errorf("getting Pulumi API endpoint: %v", err)
}
url := fmt.Sprintf("%s/api%s", apiEndpoint, path)
// Normalize URL components
apiEndpoint = strings.TrimSuffix(apiEndpoint, "/")
path = strings.TrimPrefix(path, "/")
url := fmt.Sprintf("%s/api/%s", apiEndpoint, path)
req, err := http.NewRequest(method, url, bytes.NewBuffer(body))
if err != nil {
return nil, fmt.Errorf("creating new HTTP request: %v", err)