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

Fix ApigeeOrganization update response type. #20854

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
3 changes: 3 additions & 0 deletions .changelog/12413.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:bug
apigee: fixed error 404 for `organization` update requests.
```
8 changes: 0 additions & 8 deletions google/services/apigee/resource_apigee_organization.go
Original file line number Diff line number Diff line change
Expand Up @@ -552,14 +552,6 @@ func resourceApigeeOrganizationUpdate(d *schema.ResourceData, meta interface{})
log.Printf("[DEBUG] Finished updating Organization %q: %#v", d.Id(), res)
}

err = ApigeeOperationWaitTime(
config, res, "Updating Organization", userAgent,
d.Timeout(schema.TimeoutUpdate))

if err != nil {
return err
}

return resourceApigeeOrganizationRead(d, meta)
}

Expand Down
213 changes: 213 additions & 0 deletions google/services/apigee/resource_apigee_organization_update_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,213 @@
// Copyright (c) HashiCorp, Inc.
// SPDX-License-Identifier: MPL-2.0
package apigee_test

import (
"maps"
"testing"

"github.com/hashicorp/terraform-plugin-testing/helper/resource"

"github.com/hashicorp/terraform-plugin-testing/plancheck"
"github.com/hashicorp/terraform-provider-google/google/acctest"
"github.com/hashicorp/terraform-provider-google/google/envvar"
)

func TestAccApigeeOrganization_update(t *testing.T) {
acctest.SkipIfVcr(t)
t.Parallel()

default_context := map[string]interface{}{
"billing_account": envvar.GetTestBillingAccountFromEnv(t),
"org_id": envvar.GetTestOrgFromEnv(t),
"random_suffix": acctest.RandString(t, 10),
}
update_context := maps.Clone(default_context)
update_context["org_description"] = "Updated Apigee Org description."

acctest.VcrTest(t, resource.TestCase{
PreCheck: func() { acctest.AccTestPreCheck(t) },
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t),
Steps: []resource.TestStep{
{
Config: testAccApigeeOrganization_full(default_context),
},
{
ResourceName: "google_apigee_organization.apigee_org",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"project_id", "properties", "retention"},
},
{
Config: testAccApigeeOrganization_update(update_context),
ConfigPlanChecks: resource.ConfigPlanChecks{
PreApply: []plancheck.PlanCheck{
plancheck.ExpectResourceAction("google_apigee_organization.apigee_org", plancheck.ResourceActionUpdate),
},
},
},
{
ResourceName: "google_apigee_organization.apigee_org",
ImportState: true,
ImportStateVerify: true,
ImportStateVerifyIgnore: []string{"project_id", "properties", "retention"},
},
},
})
}

func testAccApigeeOrganization_full(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_project" "project" {
provider = google

project_id = "tf-test%{random_suffix}"
name = "tf-test%{random_suffix}"
org_id = "%{org_id}"
billing_account = "%{billing_account}"
deletion_policy = "DELETE"
}

resource "google_project_service" "apigee" {
provider = google

project = google_project.project.project_id
service = "apigee.googleapis.com"
}

resource "google_project_service" "compute" {
provider = google

project = google_project.project.project_id
service = "compute.googleapis.com"
}

resource "google_project_service" "servicenetworking" {
provider = google

project = google_project.project.project_id
service = "servicenetworking.googleapis.com"
}

resource "google_compute_network" "apigee_network" {
provider = google

name = "apigee-network"
project = google_project.project.project_id
depends_on = [google_project_service.compute]
}

resource "google_compute_global_address" "apigee_range" {
provider = google

name = "apigee-range"
purpose = "VPC_PEERING"
address_type = "INTERNAL"
prefix_length = 21
network = google_compute_network.apigee_network.id
project = google_project.project.project_id
}

resource "google_service_networking_connection" "apigee_vpc_connection" {
provider = google

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" {
provider = google

display_name = "apigee-org"
analytics_region = "us-central1"
description = "Terraform-managed Apigee Org"
project_id = google_project.project.project_id
authorized_network = google_compute_network.apigee_network.id
billing_type = "EVALUATION"
depends_on = [
google_service_networking_connection.apigee_vpc_connection,
google_project_service.apigee,
]
}
`, context)
}

func testAccApigeeOrganization_update(context map[string]interface{}) string {
return acctest.Nprintf(`
resource "google_project" "project" {
provider = google

project_id = "tf-test%{random_suffix}"
name = "tf-test%{random_suffix}"
org_id = "%{org_id}"
billing_account = "%{billing_account}"
deletion_policy = "DELETE"
}

resource "google_project_service" "apigee" {
provider = google

project = google_project.project.project_id
service = "apigee.googleapis.com"
}

resource "google_project_service" "compute" {
provider = google

project = google_project.project.project_id
service = "compute.googleapis.com"
}

resource "google_project_service" "servicenetworking" {
provider = google

project = google_project.project.project_id
service = "servicenetworking.googleapis.com"
}

resource "google_compute_network" "apigee_network" {
provider = google

name = "apigee-network"
project = google_project.project.project_id
depends_on = [google_project_service.compute]
}

resource "google_compute_global_address" "apigee_range" {
provider = google

name = "apigee-range"
purpose = "VPC_PEERING"
address_type = "INTERNAL"
prefix_length = 21
network = google_compute_network.apigee_network.id
project = google_project.project.project_id
}

resource "google_service_networking_connection" "apigee_vpc_connection" {
provider = google

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" {
provider = google

display_name = "apigee-org"
analytics_region = "us-central1"
description = "%{org_description}"
project_id = google_project.project.project_id
authorized_network = google_compute_network.apigee_network.id
billing_type = "EVALUATION"
depends_on = [
google_service_networking_connection.apigee_vpc_connection,
google_project_service.apigee,
]
}
`, context)
}
Loading