Merge pull request #427 from terraform-providers/ap_426_provider_inse…

…cure_test add /orgs mockgithub api endpoint in provider test
integrations · Apr 15, 2020 · d9d9afd · d9d9afd
2 parents e8af748 + b5c68ef
commit d9d9afd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Generate Test Fixtures
         run: |
           openssl req -x509 -newkey rsa:4096 -days 1 -nodes \
-            -subj "/C=US/ST=CA/L=San Francisco/O=HashiCorp, Inc./CN=localhost" \
+            -subj "/C=US/ST=CA/L=San Francisco/O=HashiCorp, Inc./CN=untrusted" \
             -keyout github/test-fixtures/key.pem -out github/test-fixtures/cert.pem
 
       - name: Acceptance Tests

diff --git a/github/provider_test.go b/github/provider_test.go
@@ -70,7 +70,7 @@ func testAccPreCheck(t *testing.T) {
 	}
 }
 
-func TestProvider_individual(t *testing.T) {
+func TestAccProvider_individual(t *testing.T) {
 
 	username := "hashibot"
 	resource.ParallelTest(t, resource.TestCase{
@@ -110,7 +110,7 @@ func TestProvider_individual(t *testing.T) {
 	})
 }
 
-func TestProvider_anonymous(t *testing.T) {
+func TestAccProvider_anonymous(t *testing.T) {
 
 	username := "hashibot"
 	resource.Test(t, resource.TestCase{
@@ -144,7 +144,7 @@ func TestProvider_anonymous(t *testing.T) {
 	})
 }
 
-func TestProvider_insecure(t *testing.T) {
+func TestAccProvider_insecure(t *testing.T) {
 	// Use ephemeral port range (49152–65535)
 	port := fmt.Sprintf("%d", 49152+rand.Intn(16382))
 
@@ -199,6 +199,7 @@ func githubTLSApiMock(port, certFile, keyFile string, t *testing.T) (string, fun
 	mux.HandleFunc("/users/hashibot", testRespondJson(userResponseBody))
 	mux.HandleFunc("/users/hashibot/gpg_keys", testRespondJson(gpgKeysResponseBody))
 	mux.HandleFunc("/users/hashibot/keys", testRespondJson(keysResponseBody))
+	mux.HandleFunc("/orgs/"+testOrganization, testRespondJson(orgResponseBody(port)))
 
 	server := &http.Server{
 		Addr:    ":" + port,
@@ -317,3 +318,14 @@ const keysResponseBody = `[
     "key": "ssh-rsa AAA..."
   }
 ]`
+
+func orgResponseBody(port string) string {
+	url := fmt.Sprintf(`https://localhost:%s/orgs/%s`, port, testOrganization)
+	return fmt.Sprintf(`
+{
+	"login": "%s",
+	"url" : "%s",
+	"repos_url": "%s/repos"
+}
+`, testOrganization, url, url)
+}