Add billingType attribute to Apigee Organization resource

.changelog/5796.txt

@@ -0,0 +1,3 @@
+```release-note:new-resource
+Add billingType attribute to Apigee Organization resource.
+```

google-beta/resource_apigee_organization.go

@@ -61,6 +61,13 @@ func resourceApigeeOrganization() *schema.Resource {
 See [Getting started with the Service Networking API](https://cloud.google.com/service-infrastructure/docs/service-networking/getting-started).
 Valid only when 'RuntimeType' is set to CLOUD. The value can be updated only when there are no runtime instances. For example: "default".`,
 			},
+			"billing_type": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Optional:    true,
+				ForceNew:    true,
+				Description: `Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).`,
+			},
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -148,6 +155,12 @@ func resourceApigeeOrganizationCreate(d *schema.ResourceData, meta interface{})
 	} else if v, ok := d.GetOkExists("runtime_type"); !isEmptyValue(reflect.ValueOf(runtimeTypeProp)) && (ok || !reflect.DeepEqual(v, runtimeTypeProp)) {
 		obj["runtimeType"] = runtimeTypeProp
 	}
+	billingTypeProp, err := expandApigeeOrganizationBillingType(d.Get("billing_type"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("billing_type"); !isEmptyValue(reflect.ValueOf(billingTypeProp)) && (ok || !reflect.DeepEqual(v, billingTypeProp)) {
+		obj["billingType"] = billingTypeProp
+	}
 	runtimeDatabaseEncryptionKeyNameProp, err := expandApigeeOrganizationRuntimeDatabaseEncryptionKeyName(d.Get("runtime_database_encryption_key_name"), d, config)
 	if err != nil {
 		return err
@@ -258,6 +271,9 @@ func resourceApigeeOrganizationRead(d *schema.ResourceData, meta interface{}) er
 	if err := d.Set("subscription_type", flattenApigeeOrganizationSubscriptionType(res["subscriptionType"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Organization: %s", err)
 	}
+	if err := d.Set("billing_type", flattenApigeeOrganizationBillingType(res["billingType"], d, config)); err != nil {
+		return fmt.Errorf("Error reading Organization: %s", err)
+	}
 	if err := d.Set("ca_certificate", flattenApigeeOrganizationCaCertificate(res["caCertificate"], d, config)); err != nil {
 		return fmt.Errorf("Error reading Organization: %s", err)
 	}
@@ -308,6 +324,12 @@ func resourceApigeeOrganizationUpdate(d *schema.ResourceData, meta interface{})
 	} else if v, ok := d.GetOkExists("runtime_type"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, runtimeTypeProp)) {
 		obj["runtimeType"] = runtimeTypeProp
 	}
+	billingTypeProp, err := expandApigeeOrganizationBillingType(d.Get("billing_type"), d, config)
+	if err != nil {
+		return err
+	} else if v, ok := d.GetOkExists("billing_type"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, billingTypeProp)) {
+		obj["billingType"] = billingTypeProp
+	}
 	runtimeDatabaseEncryptionKeyNameProp, err := expandApigeeOrganizationRuntimeDatabaseEncryptionKeyName(d.Get("runtime_database_encryption_key_name"), d, config)
 	if err != nil {
 		return err
@@ -461,6 +483,10 @@ func flattenApigeeOrganizationSubscriptionType(v interface{}, d *schema.Resource
 	return v
 }
 
+func flattenApigeeOrganizationBillingType(v interface{}, d *schema.ResourceData, config *Config) interface{} {
+	return v
+}
+
 func flattenApigeeOrganizationCaCertificate(v interface{}, d *schema.ResourceData, config *Config) interface{} {
 	return v
 }
@@ -489,6 +515,10 @@ func expandApigeeOrganizationRuntimeType(v interface{}, d TerraformResourceData,
 	return v, nil
 }
 
+func expandApigeeOrganizationBillingType(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
+	return v, nil
+}
+
 func expandApigeeOrganizationRuntimeDatabaseEncryptionKeyName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
 	return v, nil
 }

google-beta/resource_apigee_organization_generated_test.go

@@ -246,6 +246,7 @@ resource "google_apigee_organization" "org" {
   analytics_region                     = "us-central1"
   project_id                           = google_project.project.project_id
   authorized_network                   = google_compute_network.apigee_network.id
+  billing_type                         = "EVALUATION"
   runtime_database_encryption_key_name = google_kms_crypto_key.apigee_key.id
 
   depends_on = [

website/docs/r/apigee_organization.html.markdown

@@ -167,6 +167,10 @@ The following arguments are supported:
   Default value is `CLOUD`.
   Possible values are `CLOUD` and `HYBRID`.
 
+* `billing_type` -
+  (Optional)
+  Billing type of the Apigee organization. See [Apigee pricing](https://cloud.google.com/apigee/pricing).
+
 * `runtime_database_encryption_key_name` -
   (Optional)
   Cloud KMS key name used for encrypting the data that is stored and replicated across runtime instances.