-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added code for Apigee environment groups (#4570)
* Added code for Apigee Environment * Update api.yaml * Update api.yaml * Added code for Apigee Environment * Added code for Apigee environment groups * Update api.yaml * Added code for Apigee Environment * Update api.yaml * Update api.yaml * Added code for Apigee Environment * Incorporating review comments for Apigee environment groups * Incorporating review comments for Apigee environment groups * Update reverse_check_membership.sh * Update reverse_check_membership.sh * Update check_membership.sh * Update mmv1/products/apigee/api.yaml Co-authored-by: Sam Levenick <slevenick@google.com> * Added code for Apigee Environment * Update api.yaml * Update api.yaml * Added code for Apigee Environment * Update api.yaml * Added code for Apigee Environment * Update api.yaml * Update api.yaml * Added code for Apigee Environment * Update api.yaml * Update api.yaml * Added code for Apigee Environment * Update api.yaml * Added code for Apigee Environment * Update api.yaml * Update api.yaml * Added code for Apigee Environment * Update mmv1/products/apigee/api.yaml Co-authored-by: Sam Levenick <slevenick@google.com> * fixing .ci errors Co-authored-by: Sam Levenick <slevenick@google.com>
- Loading branch information
1 parent
7acd4f9
commit 1f1a032
Showing
5 changed files
with
209 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
mmv1/templates/terraform/custom_import/apigee_environment_group.go.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| config := meta.(*Config) | ||
|
|
||
| // current import_formats cannot import fields with forward slashes in their value | ||
| if err := parseImportId([]string{"(?P<name>.+)"}, d, config); err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| nameParts := strings.Split(d.Get("name").(string), "/") | ||
| if len(nameParts) == 4 { | ||
| // `organizations/{{org_name}}/envgroups/{{name}}` | ||
| orgId := fmt.Sprintf("organizations/%s", nameParts[1]) | ||
| if err := d.Set("org_id", orgId); err != nil { | ||
| return nil, fmt.Errorf("Error setting org_id: %s", err) | ||
| } | ||
| if err := d.Set("name", nameParts[3]); err != nil { | ||
| return nil, fmt.Errorf("Error setting name: %s", err) | ||
| } | ||
| } else if len(nameParts) == 3 { | ||
| // `organizations/{{org_name}}/{{name}}` | ||
| orgId := fmt.Sprintf("organizations/%s", nameParts[1]) | ||
| if err := d.Set("org_id", orgId); err != nil { | ||
| return nil, fmt.Errorf("Error setting org_id: %s", err) | ||
| } | ||
| if err := d.Set("name", nameParts[2]); err != nil { | ||
| return nil, fmt.Errorf("Error setting name: %s", err) | ||
| } | ||
| } else { | ||
| return nil, fmt.Errorf( | ||
| "Saw %s when the name is expected to have shape %s or %s", | ||
| d.Get("name"), | ||
| "organizations/{{org_name}}/envgroups/{{name}}", | ||
| "organizations/{{org_name}}/{{name}}") | ||
| } | ||
|
|
||
| // Replace import id for the resource id | ||
| id, err := replaceVars(d, config, "{{org_id}}/envgroups/{{name}}") | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error constructing id: %s", err) | ||
| } | ||
| d.SetId(id) | ||
|
|
||
| return []*schema.ResourceData{d}, nil |
33 changes: 33 additions & 0 deletions
33
mmv1/templates/terraform/examples/apigee_environment_group_basic.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| data "google_client_config" "current" {} | ||
|
|
||
| resource "google_compute_network" "apigee_network" { | ||
| name = "apigee-network" | ||
| } | ||
|
|
||
| resource "google_compute_global_address" "apigee_range" { | ||
| name = "apigee-range" | ||
| purpose = "VPC_PEERING" | ||
| address_type = "INTERNAL" | ||
| prefix_length = 16 | ||
| network = google_compute_network.apigee_network.id | ||
| } | ||
|
|
||
| resource "google_service_networking_connection" "apigee_vpc_connection" { | ||
| network = google_compute_network.apigee_network.id | ||
| service = "servicenetworking.googleapis.com" | ||
| reserved_peering_ranges = [google_compute_global_address.apigee_range.name] | ||
| } | ||
|
|
||
| resource "google_apigee_organization" "apigee_org" { | ||
| analytics_region = "us-central1" | ||
| project_id = data.google_client_config.current.project | ||
| authorized_network = google_compute_network.apigee_network.id | ||
| depends_on = [google_service_networking_connection.apigee_vpc_connection] | ||
| } | ||
|
|
||
| resource "google_apigee_envgroup" "env_grp" { | ||
| name = "tf-test%{random_suffix}" | ||
| hostnames = ["abc.foo.com"] | ||
| org_id = google_apigee_organization.apigee_org.id | ||
| } | ||
|
|
60 changes: 60 additions & 0 deletions
60
mmv1/templates/terraform/examples/apigee_environment_group_basic_test.tf.erb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| resource "google_project" "project" { | ||
| project_id = "tf-test%{random_suffix}" | ||
| name = "tf-test%{random_suffix}" | ||
| org_id = "<%= ctx[:test_env_vars]['org_id'] %>" | ||
| billing_account = "<%= ctx[:test_env_vars]['billing_account'] %>" | ||
| } | ||
|
|
||
| resource "google_project_service" "apigee" { | ||
| project = google_project.project.project_id | ||
| service = "apigee.googleapis.com" | ||
| } | ||
|
|
||
| resource "google_project_service" "compute" { | ||
| project = google_project.project.project_id | ||
| service = "compute.googleapis.com" | ||
| } | ||
|
|
||
| resource "google_project_service" "servicenetworking" { | ||
| project = google_project.project.project_id | ||
| service = "servicenetworking.googleapis.com" | ||
| } | ||
|
|
||
| resource "google_compute_network" "apigee_network" { | ||
| name = "apigee-network" | ||
| project = google_project.project.project_id | ||
| depends_on = [google_project_service.compute] | ||
| } | ||
|
|
||
| resource "google_compute_global_address" "apigee_range" { | ||
| name = "apigee-range" | ||
| purpose = "VPC_PEERING" | ||
| address_type = "INTERNAL" | ||
| prefix_length = 16 | ||
| network = google_compute_network.apigee_network.id | ||
| project = google_project.project.project_id | ||
| } | ||
|
|
||
| resource "google_service_networking_connection" "apigee_vpc_connection" { | ||
| network = google_compute_network.apigee_network.id | ||
| service = "servicenetworking.googleapis.com" | ||
| reserved_peering_ranges = [google_compute_global_address.apigee_range.name] | ||
| depends_on = [google_project_service.servicenetworking] | ||
| } | ||
|
|
||
| resource "google_apigee_organization" "apigee_org" { | ||
| analytics_region = "us-central1" | ||
| project_id = google_project.project.project_id | ||
| authorized_network = google_compute_network.apigee_network.id | ||
| depends_on = [ | ||
| google_service_networking_connection.apigee_vpc_connection, | ||
| google_project_service.apigee, | ||
| ] | ||
| } | ||
|
|
||
| resource "google_apigee_envgroup" "<%= ctx[:primary_resource_id] %>" { | ||
| org_id = google_apigee_organization.apigee_org.id | ||
| name = "tf-test%{random_suffix}" | ||
| hostnames = ["abc.foo.com"] | ||
| } | ||
|
|