Merge pull request #452 from terraform-providers/revert-441-visibility

Revert "Visibility"
integrations · May 10, 2020 · 91fc6ed · 91fc6ed
2 parents fa43c22 + 95417be
commit 91fc6ed
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 51 deletions.
diff --git a/github/data_source_github_repository.go b/github/data_source_github_repository.go
@@ -37,10 +37,6 @@ func dataSourceGithubRepository() *schema.Resource {
 				Type:     schema.TypeBool,
 				Computed: true,
 			},
-			"visibility": {
-				Type:     schema.TypeString,
-				Computed: true,
-			},
 			"has_issues": {
 				Type:     schema.TypeBool,
 				Computed: true,
@@ -147,7 +143,6 @@ func dataSourceGithubRepositoryRead(d *schema.ResourceData, meta interface{}) er
 	d.Set("description", repo.GetDescription())
 	d.Set("homepage_url", repo.GetHomepage())
 	d.Set("private", repo.GetPrivate())
-	d.Set("visibility", repo.GetVisibility())
 	d.Set("has_issues", repo.GetHasIssues())
 	d.Set("has_wiki", repo.GetHasWiki())
 	d.Set("allow_merge_commit", repo.GetAllowMergeCommit())

diff --git a/github/data_source_github_repository_test.go b/github/data_source_github_repository_test.go
@@ -77,7 +77,6 @@ func testRepoCheck() resource.TestCheckFunc {
 		resource.TestCheckResourceAttr("data.github_repository.test", "id", "test-repo"),
 		resource.TestCheckResourceAttr("data.github_repository.test", "name", "test-repo"),
 		resource.TestCheckResourceAttr("data.github_repository.test", "private", "false"),
-		resource.TestCheckResourceAttr("data.github_repository.test", "visibility", "public"),
 		resource.TestCheckResourceAttr("data.github_repository.test", "description", "Test description, used in GitHub Terraform provider acceptance test."),
 		resource.TestCheckResourceAttr("data.github_repository.test", "homepage_url", "http://www.example.com"),
 		resource.TestCheckResourceAttr("data.github_repository.test", "has_issues", "true"),

diff --git a/github/resource_github_repository.go b/github/resource_github_repository.go
@@ -44,12 +44,6 @@ func resourceGithubRepository() *schema.Resource {
 				Type:     schema.TypeBool,
 				Optional: true,
 			},
-			"visibility": {
-				Type:         schema.TypeString,
-				Optional:     true,
-				Default:      "public",
-				ValidateFunc: validation.StringInSlice([]string{"public", "private", "internal"}, false),
-			},
 			"has_issues": {
 				Type:     schema.TypeBool,
 				Optional: true,
@@ -185,7 +179,6 @@ func resourceGithubRepositoryObject(d *schema.ResourceData) *github.Repository {
 		Description:         github.String(d.Get("description").(string)),
 		Homepage:            github.String(d.Get("homepage_url").(string)),
 		Private:             github.Bool(d.Get("private").(bool)),
-		Visibility:          github.String(d.Get("visibility").(string)),
 		HasDownloads:        github.Bool(d.Get("has_downloads").(bool)),
 		HasIssues:           github.Bool(d.Get("has_issues").(bool)),
 		HasProjects:         github.Bool(d.Get("has_projects").(bool)),
@@ -310,7 +303,6 @@ func resourceGithubRepositoryRead(d *schema.ResourceData, meta interface{}) erro
 	d.Set("description", repo.GetDescription())
 	d.Set("homepage_url", repo.GetHomepage())
 	d.Set("private", repo.GetPrivate())
-	d.Set("visibility", repo.GetVisibility())
 	d.Set("has_issues", repo.GetHasIssues())
 	d.Set("has_projects", repo.GetHasProjects())
 	d.Set("has_wiki", repo.GetHasWiki())

diff --git a/github/resource_github_repository_test.go b/github/resource_github_repository_test.go
@@ -71,7 +71,6 @@ func TestAccGithubRepository_basic(t *testing.T) {
 						Name:                name,
 						Description:         description,
 						Homepage:            "http://example.com/",
-						Visibility:          "public",
 						HasIssues:           true,
 						HasWiki:             true,
 						IsTemplate:          false,
@@ -94,7 +93,6 @@ func TestAccGithubRepository_basic(t *testing.T) {
 						Name:             name,
 						Description:      "Updated " + description,
 						Homepage:         "http://example.com/",
-						Visibility:       "public",
 						AllowMergeCommit: false,
 						AllowSquashMerge: true,
 						AllowRebaseMerge: true,
@@ -138,7 +136,6 @@ func TestAccGithubRepository_archive(t *testing.T) {
 						Name:             name,
 						Description:      description,
 						Homepage:         "http://example.com/",
-						Visibility:       "public",
 						HasIssues:        true,
 						HasWiki:          true,
 						AllowMergeCommit: true,
@@ -183,7 +180,6 @@ func TestAccGithubRepository_archiveUpdate(t *testing.T) {
 						Name:             name,
 						Description:      description,
 						Homepage:         "http://example.com/",
-						Visibility:       "public",
 						HasIssues:        true,
 						HasWiki:          true,
 						AllowMergeCommit: true,
@@ -203,7 +199,6 @@ func TestAccGithubRepository_archiveUpdate(t *testing.T) {
 						Name:             name,
 						Description:      description,
 						Homepage:         "http://example.com/",
-						Visibility:       "public",
 						HasIssues:        true,
 						HasWiki:          true,
 						AllowMergeCommit: true,
@@ -269,7 +264,6 @@ func TestAccGithubRepository_defaultBranch(t *testing.T) {
 						Name:             name,
 						Description:      description,
 						Homepage:         "http://example.com/",
-						Visibility:       "public",
 						HasIssues:        true,
 						HasWiki:          true,
 						AllowMergeCommit: true,
@@ -295,7 +289,6 @@ func TestAccGithubRepository_defaultBranch(t *testing.T) {
 						Name:             name,
 						Description:      "Updated " + description,
 						Homepage:         "http://example.com/",
-						Visibility:       "public",
 						AutoInit:         true,
 						HasIssues:        true,
 						HasWiki:          true,
@@ -341,7 +334,6 @@ func TestAccGithubRepository_templates(t *testing.T) {
 						Name:              name,
 						Description:       description,
 						Homepage:          "http://example.com/",
-						Visibility:        "public",
 						HasIssues:         true,
 						HasWiki:           true,
 						AllowMergeCommit:  true,
@@ -401,7 +393,6 @@ func TestAccGithubRepository_topics(t *testing.T) {
 						Name:        name,
 						Description: description,
 						Homepage:    "http://example.com/",
-						Visibility:  "public",
 						Topics:      []string{"topic2", "topic1"},
 
 						// non-zero defaults
@@ -420,7 +411,6 @@ func TestAccGithubRepository_topics(t *testing.T) {
 						Name:        name,
 						Description: description,
 						Homepage:    "http://example.com/",
-						Visibility:  "public",
 						Topics:      []string{"topic1", "topic2", "topic3"},
 
 						// non-zero defaults
@@ -439,7 +429,6 @@ func TestAccGithubRepository_topics(t *testing.T) {
 						Name:        name,
 						Description: description,
 						Homepage:    "http://example.com/",
-						Visibility:  "public",
 						Topics:      []string{},
 
 						// non-zero defaults
@@ -573,7 +562,6 @@ type testAccGithubRepositoryExpectedAttributes struct {
 	Description         string
 	Homepage            string
 	Private             bool
-	Visibility          string
 	HasDownloads        bool
 	HasIssues           bool
 	HasProjects         bool
@@ -606,9 +594,6 @@ func testAccCheckGithubRepositoryAttributes(repo *github.Repository, want *testA
 		if private := repo.GetPrivate(); private != want.Private {
 			return fmt.Errorf("got private %#v; want %#v", private, want.Private)
 		}
-		if visibility := repo.GetVisibility(); visibility != want.Visibility {
-			return fmt.Errorf("got visibility %#v; want %#v", visibility, want.Visibility)
-		}
 		if hasIssues := repo.GetHasIssues(); hasIssues != want.HasIssues {
 			return fmt.Errorf("got has issues %#v; want %#v", hasIssues, want.HasIssues)
 		}
@@ -772,8 +757,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = true
   has_wiki           = true
@@ -805,8 +789,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = false
   has_wiki           = false
@@ -828,8 +811,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = true
   has_wiki           = true
@@ -851,8 +833,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = true
   has_wiki           = true
@@ -875,8 +856,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = true
   has_wiki           = true
@@ -899,8 +879,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = true
   has_wiki           = true
@@ -933,8 +912,7 @@ resource "github_repository" "foo" {
 
 	# So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   has_issues         = true
   has_wiki           = true
@@ -956,8 +934,7 @@ resource "github_repository" "foo" {
 
   # So that acceptance tests can be run in a github organization
   # with no billing
-  private    = false
-  visibility = "public"
+  private = false
 
   topics = [%s]
 }

diff --git a/website/docs/d/repository.html.markdown b/website/docs/d/repository.html.markdown
@@ -33,8 +33,6 @@ The following arguments are supported:
 
 * `private` - Whether the repository is private.
 
-* `visibility` - Whether the repository is public, private or internal.
-
 * `has_issues` - Whether the repository has GitHub Issues enabled.
 
 * `has_projects` - Whether the repository has the GitHub Projects enabled.

diff --git a/website/docs/r/repository.html.markdown b/website/docs/r/repository.html.markdown
@@ -41,10 +41,6 @@ The following arguments are supported:
 
 * `private` - (Optional) Set to `true` to create a private repository.
   Repositories are created as public (e.g. open source) by default.
-
-* `visibility` - (Optional) Can be `public` or `private`. If your organization is associated with an enterprise account 
-using GitHub Enterprise Cloud or GitHub Enterprise Server 2.20+, visibility can also be `internal`. The `visibility` 
-parameter overrides the `private` parameter.
 
 * `has_issues` - (Optional) Set to `true` to enable the GitHub Issues features
   on the repository.