Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a Properties field to ApigeeOrganization #6464

Merged
merged 1 commit into from
Aug 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions mmv1/products/apigee/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,21 @@ objects:
If not specified, a Google-Managed encryption key will be used.
Valid only when `RuntimeType` is CLOUD. For example: `projects/foo/locations/us/keyRings/bar/cryptoKeys/baz`.
input: true
- !ruby/object:Api::Type::NestedObject
name: 'properties'
description: Properties defined in the Apigee organization profile.
properties:
- !ruby/object:Api::Type::Array
name: 'property'
description: List of all properties in the object.
item_type: !ruby/object:Api::Type::NestedObject
properties:
- !ruby/object:Api::Type::String
name: 'name'
description: Name of the property.
- !ruby/object:Api::Type::String
name: 'value'
description: Value of the property.
references: !ruby/object:Api::Resource::ReferenceLinks
guides:
'Creating an API organization':
Expand Down
2 changes: 2 additions & 0 deletions mmv1/products/apigee/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ overrides: !ruby/object:Overrides::ResourceOverrides
properties:
billingType: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
properties: !ruby/object:Overrides::Terraform::PropertyOverride
default_from_api: true
custom_code: !ruby/object:Provider::Terraform::CustomCode
custom_import: templates/terraform/custom_import/apigee_organization.go.erb
encoder: templates/terraform/encoders/apigee_organization.go.erb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,16 @@ resource "google_apigee_organization" "<%= ctx[:primary_resource_id] %>" {
authorized_network = google_compute_network.apigee_network.id
billing_type = "EVALUATION"
runtime_database_encryption_key_name = google_kms_crypto_key.apigee_key.id
properties {
property {
name = "features.hybrid.enabled"
value = "true"
}
property {
name = "features.mart.connect.enabled"
value = "true"
}
}

depends_on = [
google_service_networking_connection.apigee_vpc_connection,
Expand Down