Skip to content

Commit

Permalink
Revert "Apigee Nat Address Resource (#5018)" (#5576)
Browse files Browse the repository at this point in the history
This reverts commit ed44493.
  • Loading branch information
melinath authored Dec 23, 2021
1 parent b87fd99 commit 836bbbe
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 200 deletions.
58 changes: 1 addition & 57 deletions mmv1/products/apigee/api.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ objects:
name: 'instanceId'
description: |
The Apigee instance associated with the Apigee environment,
in the format `organizations/{{org_name}}/instances/{{instance_name}}`.
in the format `organisations/{{org_name}}/instances/{{instance_name}}`.
required: true
url_param_only: true
properties:
Expand Down Expand Up @@ -420,59 +420,3 @@ objects:
'Creating an environment':
'https://cloud.google.com/apigee/docs/api-platform/get-started/create-environment'
api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.envgroups.attachments/create'
- !ruby/object:Api::Resource
name: 'NatAddress'
base_url: '{{instance_id}}/natAddresses'
create_url: '{{instance_id}}/natAddresses'
delete_url: '{{instance_id}}/natAddresses/{{name}}'
self_link: '{{instance_id}}/natAddresses/{{name}}'
async: !ruby/object:Api::OpAsync
operation: !ruby/object:Api::OpAsync::Operation
path: 'name'
base_url: '{{op_id}}'
wait_ms: 1000
result: !ruby/object:Api::OpAsync::Result
path: 'response'
resource_inside_response: true
status: !ruby/object:Api::OpAsync::Status
path: 'done'
complete: True
allowed:
- True
- False
error: !ruby/object:Api::OpAsync::Error
path: 'error'
message: 'message'
input: true
description: |
Apigee NAT (network address translation) address. A NAT address is a static external IP address used for Internet egress traffic. This is not avaible for Apigee hybrid.
Apigee NAT addresses are not automatically activated because they might require explicit allow entries on the target systems first. See https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.instances.natAddresses/activate
parameters:
- !ruby/object:Api::Type::String
name: 'instanceId'
description: |
The Apigee instance associated with the Apigee environment,
in the format `organizations/{{org_name}}/instances/{{instance_name}}`.
required: true
url_param_only: true
properties:
- !ruby/object:Api::Type::String
name: 'name'
description: |
Resource ID of the NAT address.
required: true
- !ruby/object:Api::Type::String
name: 'ipAddress'
description: |
The allocated NAT IP address.
output: true
- !ruby/object:Api::Type::String
name: 'state'
description: |
State of the NAT IP address.
output: true
references: !ruby/object:Api::Resource::ReferenceLinks
guides:
'Provisioning NAT IPs':
'https://cloud.google.com/apigee/docs/api-platform/security/nat-provisioning'
api: 'https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.instances.natAddresses'
25 changes: 0 additions & 25 deletions mmv1/products/apigee/terraform.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -202,31 +202,6 @@ overrides: !ruby/object:Overrides::ResourceOverrides
delete_minutes: 30
custom_code: !ruby/object:Provider::Terraform::CustomCode
custom_import: templates/terraform/custom_import/apigee_environment_group_attachment.go.erb
'NatAddress': !ruby/object:Overrides::Terraform::ResourceOverride
autogen_async: true
import_format: ["{{instance_id}}/natAddresses/{{name}}", "{{instance_id}}/{{name}}"]
delete_url: '{{instance_id}}/natAddresses/{{name}}'
skip_sweeper: true
examples:
- !ruby/object:Provider::Terraform::Examples
name: "apigee_nat_address_basic"
skip_test: true
- !ruby/object:Provider::Terraform::Examples
# This is a more verbose version of the above that creates all
# the resources needed for the acceptance test.
name: "apigee_nat_address_basic_test"
primary_resource_id: "apigee_nat_address"
test_env_vars:
org_id: :ORG_ID
billing_account: :BILLING_ACCT
skip_docs: true
# Resource creation race
skip_vcr: true
timeouts: !ruby/object:Api::Timeouts
insert_minutes: 30
delete_minutes: 30
custom_code: !ruby/object:Provider::Terraform::CustomCode
custom_import: templates/terraform/custom_import/apigee_nat_address.go.erb
files: !ruby/object:Provider::Config::Files
# These files have templating (ERB) code that will be run.
# This is usually to add licensing info, autogeneration notices, etc.
Expand Down
18 changes: 0 additions & 18 deletions mmv1/templates/terraform/custom_import/apigee_nat_address.go.erb

This file was deleted.

36 changes: 0 additions & 36 deletions mmv1/templates/terraform/examples/apigee_nat_address_basic.tf.erb

This file was deleted.

This file was deleted.

0 comments on commit 836bbbe

Please sign in to comment.