Fix acceptance environment + support gh passwords in resources (#122)

* Enhancing github_release and cleanup script

.travis.yml

@@ -4,6 +4,11 @@ language: go
 go:
 - 1.9.x
 go_import_path: github.com/terraform-providers/terraform-provider-cf
+before_install:
+- curl https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo apt-key add -
+- echo "deb https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list
+- sudo apt-get update -q
+- sudo apt-get install cf-cli -y
 install:
 - bash scripts/gogetcookie.sh
 - go get github.com/kardianos/govendor
@@ -37,3 +42,5 @@ env:
   - secure: mTBwHPjflXfIcZc2QVl6NalrEMXNru3lvfGKcitJqzYraFcUKcYadO+ltSwI7QnuTQWwHqw4cpLL3+YQ6OyxR+vhENP7Up4OAa06AJkTv1taoBuOaeDxHuqmoyRhIcv7Ab6+gt67+fFzxxK6i8rSVTB+Q7ya0F3Hqp5X17SdlkTDc0Yu3j0NC6VzyO1dvuUDOKBXICzPl5Nrs4dHmdP7nizpScJ2GQV7AdTVaLeEweiDXBa2OXScQH1jNUBU/zm+FeClOpi6ydRwkrlVyF65Y98jzuyZKrq8ewPrayMv+4yd0JkEkIm5pv3Gk/zJf2/rjcQf4zQ4Cr2EXYcZFDFecDJwdXE8aosX3sxNY2fxThh8UrgKso4zDaiiRIbRl/GZfcgDb7k5neAKj2J+drrfrz6v0jDPAoIID/YbK2jNlq375v1V3ZaqFlMNhGBRlYJ4v3B8W2awm5YXKsT4L3JF6Au7PriUIhmEvSXch/5jmStc06a8Xy+K+bu1xadxEzMluHWi2cuOPiJ3NDm8rfQW0A7KrPI8KQnQOPzgvl1yxuhENulagcc1RBoHcZLo7mcZKxzUaut4n/mJF+B6sScefkJNk2CcsnOfnST8h8uBLeIrzjz5rKTaa0/lB8gZ8D5e0jrsV1SSrWPzeq0pXNSMUdEElfiM/RXC61x5KRikrD4=
   - secure: agcbznI0ZKEsEDA/IptJfgMF0MYAiAiy/t0NNDM57mV/KxPcwPWofbFbwqhAutBqkFX5+QJ8YzCermXIpmQ+gOEKxNtMAAgw9Zj1l2i6A4fhwwmoPHWRiISkf5jGFkT1uzOVcIj5s+VKaQFJqMJu1Forw8KkyTm526bgp3Q8fId5lTDjoWTSsxvQK2D30PEMvMfFl9eMXFbIKrZ/jGGe/cOxrpNpYhR8+xIksx6LNf3eXFdqi3YEhhqXZFK8uPtJ8oD19wYK43x66V+zV9py6liGBaI9lXLiXdf+FVVwCC++njfPAuQKv1n8lAFr/o7oPccEkgecTm1FvFuLsIDks0snIGsHMPJx6RY02gJlkkSkODQuEflH387K8PZQXE4RJXRtEOVn7XLnYFLuvm7zRgMHO/lg2h1NArNkFJAW1Rkqzw/HLgbH244PaE+hCnXnE61vYTlpxOOZEWjv2xj7o6Cr17EpAMPCxo018V/8XkrHQyOFUFJsjMKeDRNjvbYBv1xR7Pqqup6lB36g/cjkWlXeX++40G8Isj/ifAQAJIxJUOCns43v2FOTXV1arIkNb2G64p9Q3A/n1XyosIoPrMcuP1YbGvTfwVVm9J3qxGKDbqM2NgElurCNvtwMt3sunPnEVLFrIOpjI6R5PRtv/TIxaugo5agq8Q5s2oX/H0w=
   - secure: g1T2qI52ImjOpkbTIzWjcmhCfQHzpF7oqpE/OX8hoADgntCyxW4gP2TKqmusZwM607RA6/E/kAHtwwfqGs7ZqhySRLf7my/KEpmb8zgmUbNMdcDK8TptpXV9Drd2Vf/AS+fkZIyFz0Ywjrnhju1O3u2Hl/u69gWg6wGtuwWUWFnPNi+ivZsxKf6TQxnXGOhKZUssh6isEoBT5DlQBBNo1NACQRJeRApYBAG/8Ca7jpbjh5Nreoszfx0OU8iGuOZvy0hv1Wh5gz0EbemPzCQKtF1h2z2H6nVVEvm36mqmpHRI9/jSHQ2rMe1W+SksLO7+GLljFWjA+pO27hwmNiTFmywziR2YD3mbtIFYDauSsISn5ldxkS0sG85qkHbQ0+Jwduia8PWa2dcGrU8BzVgpohcVo/nL8d7BqmihuCt2WJ2HfzRIYycc6fb+9E3wnfU/s/tjJnEG09kcv9zQ73gQoVK2Wz4/AK2H91mHHxgl3eZEms0+8IxmJov7gESquW19ZuxzmKxEAgUoT4SfFFT5sfmMWkleRGbjsFeK7ybutUStzUJJWb5QblGxhJOHxmG4CKuRaXz9VIiqD3b+jLNMRY3BT16v75HwRIthERcGxHBgWQk9EUz7n6mAOCK+JC2uXZ9SchfITtAK6vGfM4pbwGSbipQW/W4B+DUYJZ9bAWo=
+  - secure: qDAYRQYsC5HTg3WJ8PFdrMI5VX2dZyaCKBlzaYswiNgKhbooz48alnC2IqZ14lViq0KAcS5zPgFvbI8RvhkhRh5GCkxUi9SZRVcKJIt5dYubCft2vmTjeJLzDAOBas7zerWXFbCCfaNBsFrXnBfU0VBdLIrzqCC7cidzROuddesuJsUY5WZ5fSDNEyzBklvwedurjSdw7QIGau0azY3EpZxTTI5JnnkZuSK+q5EwFnr3Ubt1zQRKWQ60rTu/wJDU3blKmJYh21fgnwwrgJGLyujJGVI/rX2Lf0ucsyV0YElEAwDty8BKaTgzHSa/cNdC5d6I9hA0rPEfIMwuNaXMzQTZyNNo/aoQu0lP64IcO2MobE+dOgpW5rWhKQHcI4Xz8UpRWllJvvXZPvkx4nKylIcWAiM1/PuMRvu48ZD0rz8XqL/u+vHLy6wV0UhaCO33i0obRokxm0vGh9sesW67+kD7N5FEh/NLXf4yIw4M0mETCbUCYQjrQHPSZ2VfuYfzWezphtAv3KwOzmTGTX63Be/SsMdI/VFUpboQUnUrB1hEEjrbL09Pe8nMI5HHr14jo41LbZA+J67q+XPQWB2oRMEeGRcqX0o41uLsI90CN1ZCITXMzKgCmEe7g4tEo6Sv8lwJciFb7RrjUroTN1osGlk0tm1xoUbawrnYw9AWT7U=
+  - secure: hjoC37QHe+TkafbLm0HR7uz75hHhGRGP8C7PGO0d6jmops26vMdWw3OxjpYgxGJ4vXNTZ3FkGuaq2Gs744xwD/P9ItB424crXN7/7VL5Yw/u/Y4jPwsr8ZhSERRQI87JOzFx3kX92dsAoxwoRz8FPxmFeLgz/FtNftBjcZKXAtOWkOjPu+p3/g9rVEL9nbjsUpJiKTokKay3IOpSFyKoJAx8CSrHX5npInZdM/Rz3+INkk0Fj48hr4ghlWNpsoxnHlrtOLSiEuKJZ3Nhl5MQSQxwHSRBWMP2TdWn11iqoYeilBab0s6P7Fse/w0lKYcFTseDZVq5QqGBs1JPHvQqz2RxJviDOHKHFxf1K/VxS50jb9cFmWl/1SI4nbxmpGL8Pr5hQw15TScwo4RIa2DC94JiMlPOcWxyPXu6FwZoexg99/14tb2681oa8Jk3rVNQtZuhBa4hOaXA/QrWTZMcfbGeRPMp5xVmoCRVpT644eD7fZpBol8CeFHaNj6jz8Vvk29UoAjnrT3RcNtP8ykUtoKP1g0fpyZvJzprXSOntDyLEa4+qfuU3kCi+0O/Zs2RfuxEFbyq8/R+T80cZ2e1PaSpggDSvjSW5nK2h9soph0xqGuuRbW4wcA+g9x9pEoJJBlJqgXMbPvqEFgfAqTFqNK3+8nqJaC4sOoHPUInOKE=

cloudfoundry/import_cf_buildpack_test.go

@@ -3,7 +3,9 @@ package cloudfoundry
 import (
 	"testing"
 
+	"fmt"
 	"github.com/hashicorp/terraform/helper/resource"
+	"os"
 )
 
 func TestAccBuildpack_importBasic(t *testing.T) {
@@ -17,7 +19,7 @@ func TestAccBuildpack_importBasic(t *testing.T) {
 			Steps: []resource.TestStep{
 
 				resource.TestStep{
-					Config: buildpackResource,
+					Config: fmt.Sprintf(buildpackResource, os.Getenv("GITHUB_USER"), os.Getenv("GITHUB_TOKEN")),
 				},
 
 				resource.TestStep{

cloudfoundry/provider_test.go

@@ -65,16 +65,20 @@ func testAccEnvironmentSet() bool {
 	uaaClientID := os.Getenv("CF_UAA_CLIENT_ID")
 	uaaClientSecret := os.Getenv("CF_UAA_CLIENT_SECRET")
 	skipSslValidation := strings.ToLower(os.Getenv("CF_SKIP_SSL_VALIDATION"))
+	githubUser := os.Getenv("GITHUB_USER")
+	githubPassword := os.Getenv("GITHUB_TOKEN")
 
 	if len(endpoint) == 0 ||
 		len(user) == 0 ||
 		len(password) == 0 ||
 		len(uaaClientID) == 0 ||
 		len(uaaClientSecret) == 0 ||
-		len(skipSslValidation) == 0 {
+		len(skipSslValidation) == 0 ||
+		len(githubUser) == 0 ||
+		len(githubPassword) == 0 {
 
 		fmt.Println("CF_API_URL, CF_USER, CF_PASSWORD, CF_UAA_CLIENT_ID, CF_UAA_CLIENT_SECRET " +
-			"and CF_SKIP_SSL_VALIDATION must be set for acceptance tests to work.")
+			"CF_SKIP_SSL_VALIDATION, GITHUB_USER and GITHUB_TOKEN must be set for acceptance tests to work.")
 		return false
 	}
 	return true

cloudfoundry/repo/github_release_test.go

@@ -27,7 +27,9 @@ func testReleaseFileDownload(workspace string, t *testing.T) {
 	fmt.Println("Test: release file download")
 
 	repoManager := repo.NewManager(workspace)
-	ghRelease, err := repoManager.GetGithubRelease("mevansam", "test-app", "test_release_file.zip", nil)
+	testUser := os.Getenv("GITHUB_USER")
+	testPassword := os.Getenv("GITHUB_TOKEN")
+	ghRelease, err := repoManager.GetGithubRelease("mevansam", "test-app", "test_release_file.zip", &testUser, &testPassword)
 	checkError(t, err)
 
 	err = ghRelease.SetVersion("v0.0.1", repo.DefaultVersionType)
@@ -51,7 +53,10 @@ func testSourceZipFileDownload(workspace string, t *testing.T) {
 	fmt.Println("Test: source zip file download")
 
 	repoManager := repo.NewManager(workspace)
-	ghRelease, err := repoManager.GetGithubRelease("mevansam", "test-app", "zipball", nil)
+	testUser := os.Getenv("GITHUB_USER")
+	testPassword := os.Getenv("GITHUB_TOKEN")
+	ghRelease, err := repoManager.GetGithubRelease("mevansam", "test-app", "zipball", &testUser, &testPassword)
+
 	checkError(t, err)
 
 	err = ghRelease.SetVersion("v0.0.1", repo.DefaultVersionType)
@@ -64,7 +69,10 @@ func testSourceTarFileDownload(workspace string, t *testing.T) {
 	fmt.Println("Test: source tar file download")
 
 	repoManager := repo.NewManager(workspace)
-	ghRelease, err := repoManager.GetGithubRelease("mevansam", "test-app", "tarball", nil)
+	testUser := os.Getenv("GITHUB_USER")
+	testPassword := os.Getenv("GITHUB_TOKEN")
+	ghRelease, err := repoManager.GetGithubRelease("mevansam", "test-app", "tarball", &testUser, &testPassword)
+
 	checkError(t, err)
 
 	err = ghRelease.SetVersion("v0.0.1", repo.DefaultVersionType)
@@ -109,6 +117,7 @@ func validateSourceZip(path string, t *testing.T) {
 	checkError(t, err)
 
 	for _, f := range r.File {
+
 		if f.Name == "README.md" {
 			rc, err := f.Open()
 			checkError(t, err)

cloudfoundry/repo/repo_manager.go

@@ -9,9 +9,7 @@ import (
 	"sync"
 
 	"github.com/google/go-github/github"
-	"golang.org/x/oauth2"
-
-	git "gopkg.in/src-d/go-git.v4"
+	"gopkg.in/src-d/go-git.v4"
 	"gopkg.in/src-d/go-git.v4/plumbing"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport"
 	"gopkg.in/src-d/go-git.v4/plumbing/transport/ssh"
@@ -119,19 +117,18 @@ func (rm *Manager) GetGitRepository(repoURL string, user, password, privateKey *
 }
 
 // GetGithubRelease -
-func (rm *Manager) GetGithubRelease(ghOwner, ghRepoName, archiveName string, token *string) (repo Repository, err error) {
-
+func (rm *Manager) GetGithubRelease(ghOwner, ghRepoName, archiveName string, user *string, password *string) (repo Repository, err error) {
 	var ghClient *github.Client
 	ctx := context.Background()
 
-	if token == nil {
+	if user == nil || password == nil {
 		ghClient = github.NewClient(nil)
 	} else {
-		ts := oauth2.StaticTokenSource(
-			&oauth2.Token{AccessToken: *token},
-		)
-		tc := oauth2.NewClient(ctx, ts)
-		ghClient = github.NewClient(tc)
+		tp := github.BasicAuthTransport{
+			Username: *user,
+			Password: *password,
+		}
+		ghClient = github.NewClient(tp.Client())
 	}
 
 	if _, _, err = ghClient.Repositories.Get(ctx, ghOwner, ghRepoName); err != nil {

cloudfoundry/resource_cf_app.go

@@ -165,7 +165,11 @@ func resourceApp() *schema.Resource {
 							Type:     schema.TypeString,
 							Required: true,
 						},
-						"token": &schema.Schema{
+						"user": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"password": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
 						},

cloudfoundry/resource_cf_app_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/terraform-providers/terraform-provider-cf/cloudfoundry/cfapi"
+	"os"
 )
 
 const appResourceSpringMusic = `
@@ -169,6 +170,8 @@ resource "cloudfoundry_app" "test-app" {
 		repo = "test-app"
 		filename = "test-app"
 		version = "v0.0.1"
+		user = "%s"
+		password = "%s"
 	}
 }
 resource "cloudfoundry_route" "test-app-8888" {
@@ -430,7 +433,7 @@ func TestAccApp_app2(t *testing.T) {
 			Steps: []resource.TestStep{
 
 				resource.TestStep{
-					Config: fmt.Sprintf(appResourceWithMultiplePorts, defaultAppDomain()),
+					Config: fmt.Sprintf(appResourceWithMultiplePorts, defaultAppDomain(), os.Getenv("GITHUB_USER"), os.Getenv("GITHUB_TOKEN")),
 					Check: resource.ComposeTestCheckFunc(
 						testAccCheckAppExists(refApp, func() (err error) {
 							responses := []string{"8888"}

cloudfoundry/resource_cf_buildpack.go

@@ -100,7 +100,11 @@ func resourceBuildpack() *schema.Resource {
 							Type:     schema.TypeString,
 							Required: true,
 						},
-						"token": &schema.Schema{
+						"user": &schema.Schema{
+							Type:     schema.TypeString,
+							Optional: true,
+						},
+						"password": &schema.Schema{
 							Type:     schema.TypeString,
 							Optional: true,
 						},

cloudfoundry/resource_cf_buildpack_test.go

@@ -9,6 +9,7 @@ import (
 	"github.com/hashicorp/terraform/helper/resource"
 	"github.com/hashicorp/terraform/terraform"
 	"github.com/terraform-providers/terraform-provider-cf/cloudfoundry/cfapi"
+	"os"
 )
 
 const buildpackResource = `
@@ -26,6 +27,8 @@ resource "cloudfoundry_buildpack" "tomee" {
 		repo = "tomee-buildpack"
 		version = "${var.tomee_buildpack_ver}"
 		filename = "tomee-buildpack-v4.1.zip"
+		user = "%s"
+		password = "%s"
 	}
 }
 `
@@ -48,6 +51,8 @@ resource "cloudfoundry_buildpack" "tomee" {
 		repo = "tomee-buildpack"
 		version = "${var.tomee_buildpack_ver}"
 		filename = "tomee-buildpack-v4.1.zip"
+		user = "%s"
+		password = "%s"
 	}
 }
 `
@@ -79,7 +84,7 @@ func TestAccBuildpack_normal(t *testing.T) {
 			Steps: []resource.TestStep{
 
 				resource.TestStep{
-					Config: buildpackResource,
+					Config: fmt.Sprintf(buildpackResource, os.Getenv("GITHUB_USER"), os.Getenv("GITHUB_TOKEN")),
 					Check: resource.ComposeTestCheckFunc(
 						testAccCheckBuildpackExists(refBuildpack, "tomee-buildpack-v4.1.zip"),
 						resource.TestCheckResourceAttr(
@@ -94,7 +99,7 @@ func TestAccBuildpack_normal(t *testing.T) {
 				},
 
 				resource.TestStep{
-					Config: buildpackResourceUpdate1,
+					Config: fmt.Sprintf(buildpackResourceUpdate1, os.Getenv("GITHUB_USER"), os.Getenv("GITHUB_TOKEN")),
 					Check: resource.ComposeTestCheckFunc(
 						testAccCheckBuildpackExists(refBuildpack, "tomee-buildpack-v4.1.zip"),
 						resource.TestCheckResourceAttr(

cloudfoundry/utils_repo.go

@@ -85,7 +85,7 @@ func getRepositoryFromConfig(d *schema.ResourceData) (repository repo.Repository
 
 		var (
 			arg, ghOwner, ghRepo, archiveName string
-			token                             *string
+			user, password                    *string
 		)
 
 		ghOwner = githubArgs["owner"].(string)
@@ -94,13 +94,18 @@ func getRepositoryFromConfig(d *schema.ResourceData) (repository repo.Repository
 		version = githubArgs["version"].(string)
 		versionType = repo.DefaultVersionType
 
-		if arg = githubArgs["token"].(string); len(arg) > 0 {
-			token = &arg
+		if arg = githubArgs["user"].(string); len(arg) > 0 {
+			user = &arg
 		}
 
-		if repository, err = repoManager.GetGithubRelease(ghOwner, ghRepo, archiveName, token); err != nil {
+		if arg = githubArgs["password"].(string); len(arg) > 0 {
+			password = &arg
+		}
+
+		if repository, err = repoManager.GetGithubRelease(ghOwner, ghRepo, archiveName, user, password); err != nil {
 			return repository, err
 		}
+
 	}
 	if err = repository.SetVersion(version, versionType); err != nil {
 		return repository, err

scripts/build.sh

@@ -8,6 +8,7 @@ if [[ "$TRAVIS_PULL_REQUEST" == "false" && -z "$TRAVIS_TAG" ]] ; then
     exit 0
 fi
 
+tests/clean.sh
 make testacc
 make release
 

tests/clean.sh

@@ -1,22 +1,86 @@
 #!/bin/bash
 
-cf target -o pcfdev-org -s pcfdev-space
+echo "Start cleaning up potentially leaking resources from previous test executions. Warnings about missing resources should be ignored"
+
+CF_SPACE=pcfdev-space
+CF_ORG=pcfdev-org
+
+set -e # Exit if the login fails (not set or wrongly set!)
+cf api $CF_API_URL --skip-ssl-validation
+cf login -u $CF_USER -p $CF_PASSWORD -o $CF_ORG -s $CF_SPACE
+set +e
+
+# Please add any further resources do not get destroyed
+
+# Delete apps
 
-cf unbind-route-service -f local.pcfdev.io  basic-auth --hostname php-app
-cf delete-service -f basic-auth
 cf delete -f php-app
 cf delete -f basic-auth-router
 cf delete -f basic-auth-broker
-cf delete-route -f local.pcfdev.io --hostname php-app
-cf delete-route -f local.pcfdev.io --hostname php-app-other
-cf delete-route -f local.pcfdev.io --hostname basic-auth-router
-cf delete-route -f local.pcfdev.io --hostname basic-auth-broker
+cf delete -f test-app
+cf delete -f test-docker-app
+
+# Delete org and security gorups
+
+cf delete-org -f organization-one
+cf delete-org -f myorg
+cf delete-security-group -f app-services1
+cf delete-security-group -f app-services2
+cf delete-security-group -f app-services3
+cf delete-security-group -f app-services
+
+# Delete services and service instances
+
+cf delete-service -f basic-auth
+cf delete-service -f rabbitmq
 cf purge-service-offering -f p-basic-auth
 cf delete-service-broker -f basic-auth
 
+# Delete routes
+
+cf delete-route -f $CF_TEST_APP_DOMAIN --hostname php-app
+cf delete-route -f $CF_TEST_APP_DOMAIN --hostname php-app-other
+cf delete-route -f $CF_TEST_APP_DOMAIN --hostname basic-auth-router
+cf delete-route -f $CF_TEST_APP_DOMAIN --hostname basic-auth-broker
+cf delete-route -f $CF_TEST_APP_DOMAIN --hostname test-app
+cf delete-route -f $CF_TEST_APP_DOMAIN --hostname test-docker-app
+cf unbind-route-service -f $CF_TEST_APP_DOMAIN basic-auth --hostname php-app
+
+# Delete users
+
+cf delete-user manager1@acme.com -f
+cf delete-user auditor@acme.com -f
+cf delete-user teamlead@acme.com -f
+cf delete-user developer1@acme.com -f
+cf delete-user developer2@acme.com -f
+cf delete-user developer3@acme.com -f
+cf delete-user cf-admin -f
+
 # url=$(cf curl /v2/service_brokers | jq -r '.resources[] | select(.entity.name | contains("basic-auth")) | .metadata.url')
 # if [ ! -z "${url}" ]; then
 #     echo deleting ${url}
 #     cf curl -X DELETE ${url}
 # fi
 
+# Sanity checks
+
+CF_SPACE_GUID=`cf space --guid $CF_SPACE`
+CF_ORG_GUID=`cf org --guid $CF_ORG`
+
+if [ `cf curl "/v2/apps?q=space_guid:$CF_SPACE_GUID" | jq ".total_results"` -ne "0" ]; then
+   echo "ERROR: The acceptance environment contains some residual apps, run \"cf a\" - please clean them up";
+   exit 1;
+fi
+
+if [ `cf curl "/v2/routes?q=organization_guid:$CF_ORG_GUID" | jq ".total_results"` -ne "0" ]; then
+   echo "ERROR: The acceptance environment contains some residual routes, run \"cf routes\" - please clean them up";
+   exit 1;
+fi
+
+if [ `cf curl "/v2/service_instances?q=organization_guid:$CF_ORG_GUID" | jq ".total_results"` -ne "0" ]; then
+   echo "ERROR: The acceptance environment contains some residual service instances, run \"cf s\" - please clean them up";
+   exit 1;
+fi
+
+echo "Completed cleaning up potentially leaking resources from previous test executions."
+exit 0

website/docs/r/app.html.markdown

@@ -66,7 +66,8 @@ One of the following arguments must be declared to locate application source or
 
   - `owner` - (Required, String) The github owner or organization name
   - `repo` - (Required, String) The repository containing the release
-  - `token` - (Optional, String) Github API token to use to access Github
+  - `user` - (Optional, String) Github user to use to access Github
+  - `password` - (Optional, String) Github password/personal token to use to access Github
   - `version` - (Optional, String) The version or tag of the release.
   - `filename` - (Required, String) The name of the published file. The values `zipball` or `tarball` will download the published
 

website/docs/r/buildpack.html.markdown

@@ -54,7 +54,8 @@ One of the following arguments must be declared to locate buildpack source or ar
 * `github_release` - (Optional, String) The Buildpack archive published as a github release.
   - `owner` - (Required, String) The github owner or organization name.
   - `repo` - (Required, String) The repository containing the release.
-  - `token` - (Optional, String) Github API token to use to access Github.
+  - `user` - (Optional, String) Github user to use to access Github.
+  - `password` - (Optional, String) Github password/personal token to use to access Github.
   - `version` - (Optional, String) The version or tag of the release.
   - `filename` - (Required, String) The name of the published file. The values `zipball` or `tarball` will download the published  source archive.