Merge commit 'refs/pull/680/head' of github.com:integrations/terrafor…

…m-provider-github into test/pull/680

examples/repo_org_internal/README.md

@@ -0,0 +1,18 @@
+# Repository Visibility with Org, type internal
+
+This demos various repository [visibility settings](https://help.github.com/en/github/administering-a-repository/setting-repository-visibility) for repositories.
+
+This example will create a repositories in the specified `owner` organization. See https://www.terraform.io/docs/providers/github/index.html for details on configuring [`providers.tf`](./providers.tf) accordingly.
+
+Alternatively, you may use variables passed via command line:
+
+```console
+export GITHUB_OWNER=
+export GITHUB_TOKEN=
+```
+
+```console
+terraform apply \
+  -var "owner=${GITHUB_OWNER}" \
+  -var "github_token=${GITHUB_TOKEN}"
+```

examples/repo_org_internal/cli.cfg

@@ -0,0 +1,10 @@
+provider_installation {
+  filesystem_mirror {
+    path    = "/Users/jurgen.weber/checkouts/terraform/terraform-provider-github/examples/repo_org_internal/terraform.d/plugins"
+    include = ["*/*/*"]
+  }
+  direct {
+    exclude = ["*/*/*"]
+  }
+}
+

examples/repo_org_internal/main.tf

@@ -0,0 +1,5 @@
+resource github_repository internal {
+  name        = "mtribes-jurgen"
+  description = "A internal-visible repository created by Terraform"
+  visibility  = "internal"
+}

examples/repo_org_internal/outputs.tf

@@ -0,0 +1,4 @@
+output internal_repository {
+  description = "Example repository JSON blob"
+  value       = github_repository.internal
+}

examples/repo_org_internal/providers.tf

@@ -0,0 +1,4 @@
+provider github {
+  owner = var.owner
+  token = var.github_token
+}

examples/repo_org_internal/variables.tf

@@ -0,0 +1,9 @@
+variable owner {
+  description = "GitHub owner used to configure the provider"
+  type        = string
+}
+
+variable github_token {
+  description = "GitHub access token used to configure the provider"
+  type        = string
+}

github/resource_github_repository.go

@@ -271,11 +271,6 @@ func resourceGithubRepositoryCreate(d *schema.ResourceData, meta interface{}) er
 	repoReq := resourceGithubRepositoryObject(d)
 	owner := meta.(*Owner).name
 
-	// Auth issues (403 You need admin access to the organization before adding a repository to it.)
-	// are encountered when the resources is created with the visibility parameter. As
-	// resourceGithubRepositoryUpdate is called immediately after, this is subsequently corrected.
-	repoReq.Visibility = nil
-
 	repoName := repoReq.GetName()
 	ctx := context.Background()
 
@@ -462,8 +457,15 @@ func resourceGithubRepositoryUpdate(d *schema.ResourceData, meta interface{}) er
 
 	repoReq := resourceGithubRepositoryObject(d)
 
-	// The endpoint will throw an error if trying to PATCH with a visibility value that is the same
-	if !d.HasChange("visibility") {
+	if d.HasChange("visibility") {
+		// The endpoint will throw an error if this repo is being created and the old value is ""
+		o, n := d.GetChange("visibility")
+		log.Printf("[DEBUG] Old Value %v New Value %v", o, n)
+		if o.(string) == "" {
+			repoReq.Visibility = nil
+		}
+	} else {
+		// The endpoint will throw an error if trying to PATCH with a visibility value that is the same
 		repoReq.Visibility = nil
 	}