From 68654b1aec7586b26de9f2ee5be8323711b81144 Mon Sep 17 00:00:00 2001
From: "daniel.deacon-smith" <d.deaconsmith@gmail.com>
Date: Tue, 14 Jan 2020 14:18:17 +0000
Subject: [PATCH] Deprecate proxy_deployment org field

This field is not used so we should remove it
---
 apigee/resource_api_proxy_deployment.go      | 6 +++---
 apigee/resource_api_proxy_deployment_test.go | 5 -----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/apigee/resource_api_proxy_deployment.go b/apigee/resource_api_proxy_deployment.go
index 373c1ee..b97b441 100644
--- a/apigee/resource_api_proxy_deployment.go
+++ b/apigee/resource_api_proxy_deployment.go
@@ -28,9 +28,9 @@ func resourceApiProxyDeployment() *schema.Resource {
 				ForceNew: true,
 			},
 			"org": {
-				Type:     schema.TypeString,
-				Required: true,
-				ForceNew: true,
+				Type:       schema.TypeString,
+				Optional:   true,
+				Deprecated: "org is not required, the value from the provider is used.",
 			},
 			"env": {
 				Type:     schema.TypeString,
diff --git a/apigee/resource_api_proxy_deployment_test.go b/apigee/resource_api_proxy_deployment_test.go
index 12bb821..57240e0 100644
--- a/apigee/resource_api_proxy_deployment_test.go
+++ b/apigee/resource_api_proxy_deployment_test.go
@@ -22,8 +22,6 @@ func TestAccProxyDeployment_Updated(t *testing.T) {
 					testAccCheckProxyDeploymentExists("apigee_api_proxy_deployment.foo_api_proxy_deployment", "foo_proxy_terraformed"),
 					resource.TestCheckResourceAttr(
 						"apigee_api_proxy_deployment.foo_api_proxy_deployment", "proxy_name", "foo_proxy_terraformed"),
-					resource.TestCheckResourceAttr(
-						"apigee_api_proxy_deployment.foo_api_proxy_deployment", "org", "zambien-trial"),
 					resource.TestCheckResourceAttr(
 						"apigee_api_proxy_deployment.foo_api_proxy_deployment", "revision", "1"),
 				),
@@ -35,8 +33,6 @@ func TestAccProxyDeployment_Updated(t *testing.T) {
 					testAccCheckProxyDeploymentExists("apigee_api_proxy_deployment.foo_api_proxy_deployment", "foo_proxy_terraformed"),
 					resource.TestCheckResourceAttr(
 						"apigee_api_proxy_deployment.foo_api_proxy_deployment", "proxy_name", "foo_proxy_terraformed"),
-					resource.TestCheckResourceAttr(
-						"apigee_api_proxy_deployment.foo_api_proxy_deployment", "org", "zambien-trial"),
 					resource.TestCheckResourceAttr(
 						"apigee_api_proxy_deployment.foo_api_proxy_deployment", "revision", "2"),
 					resource.TestCheckResourceAttr(
@@ -95,7 +91,6 @@ resource "apigee_api_proxy" "foo_api_proxy" {
 
 resource "apigee_api_proxy_deployment" "foo_api_proxy_deployment" {
    proxy_name   = "${apigee_api_proxy.foo_api_proxy.name}"
-   org          = "zambien-trial"
    env          = "test"
    revision     = "2"
    delay		= "2"