diff --git a/.changelog/5576.txt b/.changelog/5576.txt new file mode 100644 index 0000000000..e0943c5a4f --- /dev/null +++ b/.changelog/5576.txt @@ -0,0 +1,2 @@ +```release-note:none +``` diff --git a/google-beta/provider.go b/google-beta/provider.go index 6403a9978f..9d96d72ee1 100644 --- a/google-beta/provider.go +++ b/google-beta/provider.go @@ -900,9 +900,9 @@ func Provider() *schema.Provider { return provider } -// Generated resources: 243 +// Generated resources: 242 // Generated IAM resources: 123 -// Total generated resources: 366 +// Total generated resources: 365 func ResourceMap() map[string]*schema.Resource { resourceMap, _ := ResourceMapWithErrors() return resourceMap @@ -945,7 +945,6 @@ func ResourceMapWithErrors() (map[string]*schema.Resource, error) { "google_apigee_envgroup": resourceApigeeEnvgroup(), "google_apigee_instance_attachment": resourceApigeeInstanceAttachment(), "google_apigee_envgroup_attachment": resourceApigeeEnvgroupAttachment(), - "google_apigee_nat_address": resourceApigeeNatAddress(), "google_app_engine_domain_mapping": resourceAppEngineDomainMapping(), "google_app_engine_firewall_rule": resourceAppEngineFirewallRule(), "google_app_engine_standard_app_version": resourceAppEngineStandardAppVersion(), diff --git a/google-beta/resource_apigee_instance_attachment.go b/google-beta/resource_apigee_instance_attachment.go index eca408aa6b..c6c736e05e 100644 --- a/google-beta/resource_apigee_instance_attachment.go +++ b/google-beta/resource_apigee_instance_attachment.go @@ -50,7 +50,7 @@ func resourceApigeeInstanceAttachment() *schema.Resource { Required: true, ForceNew: true, 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}}'.`, }, "name": { Type: schema.TypeString, diff --git a/google-beta/resource_apigee_nat_address.go b/google-beta/resource_apigee_nat_address.go deleted file mode 100644 index de09e5d4fd..0000000000 --- a/google-beta/resource_apigee_nat_address.go +++ /dev/null @@ -1,249 +0,0 @@ -// ---------------------------------------------------------------------------- -// -// *** AUTO GENERATED CODE *** Type: MMv1 *** -// -// ---------------------------------------------------------------------------- -// -// This file is automatically generated by Magic Modules and manual -// changes will be clobbered when the file is regenerated. -// -// Please read more about how to change this file in -// .github/CONTRIBUTING.md. -// -// ---------------------------------------------------------------------------- - -package google - -import ( - "fmt" - "log" - "reflect" - "time" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" -) - -func resourceApigeeNatAddress() *schema.Resource { - return &schema.Resource{ - Create: resourceApigeeNatAddressCreate, - Read: resourceApigeeNatAddressRead, - Delete: resourceApigeeNatAddressDelete, - - Importer: &schema.ResourceImporter{ - State: resourceApigeeNatAddressImport, - }, - - Timeouts: &schema.ResourceTimeout{ - Create: schema.DefaultTimeout(30 * time.Minute), - Delete: schema.DefaultTimeout(30 * time.Minute), - }, - - Schema: map[string]*schema.Schema{ - "instance_id": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - Description: `The Apigee instance associated with the Apigee environment, -in the format 'organizations/{{org_name}}/instances/{{instance_name}}'.`, - }, - "name": { - Type: schema.TypeString, - Required: true, - ForceNew: true, - Description: `Resource ID of the NAT address.`, - }, - "ip_address": { - Type: schema.TypeString, - Computed: true, - Description: `The allocated NAT IP address.`, - }, - "state": { - Type: schema.TypeString, - Computed: true, - Description: `State of the NAT IP address.`, - }, - }, - UseJSONNumber: true, - } -} - -func resourceApigeeNatAddressCreate(d *schema.ResourceData, meta interface{}) error { - config := meta.(*Config) - userAgent, err := generateUserAgentString(d, config.userAgent) - if err != nil { - return err - } - - obj := make(map[string]interface{}) - nameProp, err := expandApigeeNatAddressName(d.Get("name"), d, config) - if err != nil { - return err - } else if v, ok := d.GetOkExists("name"); !isEmptyValue(reflect.ValueOf(nameProp)) && (ok || !reflect.DeepEqual(v, nameProp)) { - obj["name"] = nameProp - } - - url, err := replaceVars(d, config, "{{ApigeeBasePath}}{{instance_id}}/natAddresses") - if err != nil { - return err - } - - log.Printf("[DEBUG] Creating new NatAddress: %#v", obj) - billingProject := "" - - // err == nil indicates that the billing_project value was found - if bp, err := getBillingProject(d, config); err == nil { - billingProject = bp - } - - res, err := sendRequestWithTimeout(config, "POST", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutCreate)) - if err != nil { - return fmt.Errorf("Error creating NatAddress: %s", err) - } - - // Store the ID now - id, err := replaceVars(d, config, "{{instance_id}}/natAddresses/{{name}}") - if err != nil { - return fmt.Errorf("Error constructing id: %s", err) - } - d.SetId(id) - - // Use the resource in the operation response to populate - // identity fields and d.Id() before read - var opRes map[string]interface{} - err = apigeeOperationWaitTimeWithResponse( - config, res, &opRes, "Creating NatAddress", userAgent, - d.Timeout(schema.TimeoutCreate)) - if err != nil { - // The resource didn't actually create - d.SetId("") - return fmt.Errorf("Error waiting to create NatAddress: %s", err) - } - - if err := d.Set("name", flattenApigeeNatAddressName(opRes["name"], d, config)); err != nil { - return err - } - - // This may have caused the ID to update - update it if so. - id, err = replaceVars(d, config, "{{instance_id}}/natAddresses/{{name}}") - if err != nil { - return fmt.Errorf("Error constructing id: %s", err) - } - d.SetId(id) - - log.Printf("[DEBUG] Finished creating NatAddress %q: %#v", d.Id(), res) - - return resourceApigeeNatAddressRead(d, meta) -} - -func resourceApigeeNatAddressRead(d *schema.ResourceData, meta interface{}) error { - config := meta.(*Config) - userAgent, err := generateUserAgentString(d, config.userAgent) - if err != nil { - return err - } - - url, err := replaceVars(d, config, "{{ApigeeBasePath}}{{instance_id}}/natAddresses/{{name}}") - if err != nil { - return err - } - - billingProject := "" - - // err == nil indicates that the billing_project value was found - if bp, err := getBillingProject(d, config); err == nil { - billingProject = bp - } - - res, err := sendRequest(config, "GET", billingProject, url, userAgent, nil) - if err != nil { - return handleNotFoundError(err, d, fmt.Sprintf("ApigeeNatAddress %q", d.Id())) - } - - if err := d.Set("name", flattenApigeeNatAddressName(res["name"], d, config)); err != nil { - return fmt.Errorf("Error reading NatAddress: %s", err) - } - if err := d.Set("ip_address", flattenApigeeNatAddressIpAddress(res["ipAddress"], d, config)); err != nil { - return fmt.Errorf("Error reading NatAddress: %s", err) - } - if err := d.Set("state", flattenApigeeNatAddressState(res["state"], d, config)); err != nil { - return fmt.Errorf("Error reading NatAddress: %s", err) - } - - return nil -} - -func resourceApigeeNatAddressDelete(d *schema.ResourceData, meta interface{}) error { - config := meta.(*Config) - userAgent, err := generateUserAgentString(d, config.userAgent) - if err != nil { - return err - } - - billingProject := "" - - url, err := replaceVars(d, config, "{{ApigeeBasePath}}{{instance_id}}/natAddresses/{{name}}") - if err != nil { - return err - } - - var obj map[string]interface{} - log.Printf("[DEBUG] Deleting NatAddress %q", d.Id()) - - // err == nil indicates that the billing_project value was found - if bp, err := getBillingProject(d, config); err == nil { - billingProject = bp - } - - res, err := sendRequestWithTimeout(config, "DELETE", billingProject, url, userAgent, obj, d.Timeout(schema.TimeoutDelete)) - if err != nil { - return handleNotFoundError(err, d, "NatAddress") - } - - err = apigeeOperationWaitTime( - config, res, "Deleting NatAddress", userAgent, - d.Timeout(schema.TimeoutDelete)) - - if err != nil { - return err - } - - log.Printf("[DEBUG] Finished deleting NatAddress %q: %#v", d.Id(), res) - return nil -} - -func resourceApigeeNatAddressImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { - config := meta.(*Config) - - // current import_formats cannot import fields with forward slashes in their value - if err := parseImportId([]string{ - "(?P.+)/natAddresses/(?P.+)", - "(?P.+)/(?P.+)", - }, d, config); err != nil { - return nil, err - } - - // Replace import id for the resource id - id, err := replaceVars(d, config, "{{instance_id}}/natAddresses/{{name}}") - if err != nil { - return nil, fmt.Errorf("Error constructing id: %s", err) - } - d.SetId(id) - - return []*schema.ResourceData{d}, nil -} - -func flattenApigeeNatAddressName(v interface{}, d *schema.ResourceData, config *Config) interface{} { - return v -} - -func flattenApigeeNatAddressIpAddress(v interface{}, d *schema.ResourceData, config *Config) interface{} { - return v -} - -func flattenApigeeNatAddressState(v interface{}, d *schema.ResourceData, config *Config) interface{} { - return v -} - -func expandApigeeNatAddressName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { - return v, nil -} diff --git a/google-beta/resource_apigee_nat_address_generated_test.go b/google-beta/resource_apigee_nat_address_generated_test.go deleted file mode 100644 index 22b1c76f9d..0000000000 --- a/google-beta/resource_apigee_nat_address_generated_test.go +++ /dev/null @@ -1,154 +0,0 @@ -// ---------------------------------------------------------------------------- -// -// *** AUTO GENERATED CODE *** Type: MMv1 *** -// -// ---------------------------------------------------------------------------- -// -// This file is automatically generated by Magic Modules and manual -// changes will be clobbered when the file is regenerated. -// -// Please read more about how to change this file in -// .github/CONTRIBUTING.md. -// -// ---------------------------------------------------------------------------- - -package google - -import ( - "fmt" - "strings" - "testing" - - "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" - "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" -) - -func TestAccApigeeNatAddress_apigeeNatAddressBasicTestExample(t *testing.T) { - skipIfVcr(t) - t.Parallel() - - context := map[string]interface{}{ - "org_id": getTestOrgFromEnv(t), - "billing_account": getTestBillingAccountFromEnv(t), - "random_suffix": randString(t, 10), - } - - vcrTest(t, resource.TestCase{ - PreCheck: func() { testAccPreCheck(t) }, - Providers: testAccProviders, - CheckDestroy: testAccCheckApigeeNatAddressDestroyProducer(t), - Steps: []resource.TestStep{ - { - Config: testAccApigeeNatAddress_apigeeNatAddressBasicTestExample(context), - }, - { - ResourceName: "google_apigee_nat_address.apigee_nat_address", - ImportState: true, - ImportStateVerify: true, - ImportStateVerifyIgnore: []string{"instance_id"}, - }, - }, - }) -} - -func testAccApigeeNatAddress_apigeeNatAddressBasicTestExample(context map[string]interface{}) string { - return Nprintf(` -resource "google_project" "project" { - project_id = "tf-test%{random_suffix}" - name = "tf-test%{random_suffix}" - org_id = "%{org_id}" - billing_account = "%{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_instance" "apigee_instance" { - name = "tf-test%{random_suffix}" - location = "us-central1-b" - org_id = google_apigee_organization.apigee_org.id -} - -resource "google_apigee_nat_address" "apigee_nat_address" { - instance_id = google_apigee_instance.apigee_instance.id - name = "nat-address" -} -`, context) -} - -func testAccCheckApigeeNatAddressDestroyProducer(t *testing.T) func(s *terraform.State) error { - return func(s *terraform.State) error { - for name, rs := range s.RootModule().Resources { - if rs.Type != "google_apigee_nat_address" { - continue - } - if strings.HasPrefix(name, "data.") { - continue - } - - config := googleProviderConfig(t) - - url, err := replaceVarsForTest(config, rs, "{{ApigeeBasePath}}{{instance_id}}/natAddresses/{{name}}") - if err != nil { - return err - } - - billingProject := "" - - if config.BillingProject != "" { - billingProject = config.BillingProject - } - - _, err = sendRequest(config, "GET", billingProject, url, config.userAgent, nil) - if err == nil { - return fmt.Errorf("ApigeeNatAddress still exists at %s", url) - } - } - - return nil - } -} diff --git a/website/docs/r/apigee_instance_attachment.html.markdown b/website/docs/r/apigee_instance_attachment.html.markdown index 5659656459..293adef807 100644 --- a/website/docs/r/apigee_instance_attachment.html.markdown +++ b/website/docs/r/apigee_instance_attachment.html.markdown @@ -120,7 +120,7 @@ The following arguments are supported: * `instance_id` - (Required) 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}}`. - - - diff --git a/website/docs/r/apigee_nat_address.html.markdown b/website/docs/r/apigee_nat_address.html.markdown deleted file mode 100644 index ad32a75af0..0000000000 --- a/website/docs/r/apigee_nat_address.html.markdown +++ /dev/null @@ -1,125 +0,0 @@ ---- -# ---------------------------------------------------------------------------- -# -# *** AUTO GENERATED CODE *** Type: MMv1 *** -# -# ---------------------------------------------------------------------------- -# -# This file is automatically generated by Magic Modules and manual -# changes will be clobbered when the file is regenerated. -# -# Please read more about how to change this file in -# .github/CONTRIBUTING.md. -# -# ---------------------------------------------------------------------------- -subcategory: "Apigee" -layout: "google" -page_title: "Google: google_apigee_nat_address" -sidebar_current: "docs-google-apigee-nat-address" -description: |- - Apigee NAT (network address translation) address. ---- - -# google\_apigee\_nat\_address - -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 - - -To get more information about NatAddress, see: - -* [API documentation](https://cloud.google.com/apigee/docs/reference/apis/apigee/rest/v1/organizations.instances.natAddresses) -* How-to Guides - * [Provisioning NAT IPs](https://cloud.google.com/apigee/docs/api-platform/security/nat-provisioning) - -## Example Usage - Apigee Nat Address Basic - - -```hcl -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 = google_project.project.project_id - authorized_network = google_compute_network.apigee_network.id -} - -resource "google_apigee_instance" "apigee_instance" { - name = "tf-test%{random_suffix}" - location = "us-central1-b" - org_id = google_apigee_organization.apigee_org.id -} - -resource "google_apigee_nat_address" "apigee_nat_addres" { - instance_id = google_apigee_instance.apigee_instance.id - name = "nat-address" -} -``` - -## Argument Reference - -The following arguments are supported: - - -* `name` - - (Required) - Resource ID of the NAT address. - -* `instance_id` - - (Required) - The Apigee instance associated with the Apigee environment, - in the format `organizations/{{org_name}}/instances/{{instance_name}}`. - - -- - - - - - -## Attributes Reference - -In addition to the arguments listed above, the following computed attributes are exported: - -* `id` - an identifier for the resource with format `{{instance_id}}/natAddresses/{{name}}` - -* `ip_address` - - The allocated NAT IP address. - -* `state` - - State of the NAT IP address. - - -## Timeouts - -This resource provides the following -[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: - -- `create` - Default is 30 minutes. -- `delete` - Default is 30 minutes. - -## Import - - -NatAddress can be imported using any of these accepted formats: - -``` -$ terraform import google_apigee_nat_address.default {{instance_id}}/natAddresses/{{name}} -$ terraform import google_apigee_nat_address.default {{instance_id}}/{{name}} -``` diff --git a/website/docs/r/os_config_os_policy_assignment.html.markdown b/website/docs/r/os_config_os_policy_assignment.html.markdown index 7ecb8a64c2..5356e3bdf7 100644 --- a/website/docs/r/os_config_os_policy_assignment.html.markdown +++ b/website/docs/r/os_config_os_policy_assignment.html.markdown @@ -703,6 +703,46 @@ The `disruption_budget` block supports: (Optional) Specifies the relative value defined as a percentage, which will be multiplied by a reference value. +The `source` block supports: + +* `allow_insecure` - + (Optional) + Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified. + +* `gcs` - + (Optional) + A Cloud Storage object. + +* `local_path` - + (Optional) + A local path within the VM to use. + +* `remote` - + (Optional) + A generic remote file. + +The `validate` block supports: + +* `interpreter` - + (Required) + Required. The script interpreter to use. Possible values: INTERPRETER_UNSPECIFIED, NONE, SHELL, POWERSHELL + +* `args` - + (Optional) + Optional arguments to pass to the source during execution. + +* `file` - + (Optional) + Required. A deb package. + +* `output_file_path` - + (Optional) + Only recorded for enforce Exec. Path to an output file (that is created by this Exec) whose content will be recorded in OSPolicyResourceCompliance after a successful run. Absence or failure to read this file will result in this ExecResource being non-compliant. Output file size is limited to 100K bytes. + +* `script` - + (Optional) + An inline script. The size of the script is limited to 1024 characters. + - - - * `description` - @@ -952,24 +992,6 @@ The `zypper` block supports: (Required) Required. A one word, unique name for this repository. This is the `repo id` in the zypper config file and also the `display_name` if `display_name` is omitted. This id is also used as the unique identifier when checking for GuestPolicy conflicts. -The `file` block supports: - -* `allow_insecure` - - (Optional) - Defaults to false. When false, files are subject to validations based on the file type: Remote: A checksum must be specified. Cloud Storage: An object generation number must be specified. - -* `gcs` - - (Optional) - A Cloud Storage object. - -* `local_path` - - (Optional) - A local path within the VM to use. - -* `remote` - - (Optional) - A generic remote file. - The `gcs` block supports: * `bucket` - @@ -994,28 +1016,6 @@ The `remote` block supports: (Optional) SHA256 checksum of the remote file. -The `enforce` block supports: - -* `interpreter` - - (Required) - Required. The script interpreter to use. Possible values: INTERPRETER_UNSPECIFIED, NONE, SHELL, POWERSHELL - -* `args` - - (Optional) - Optional arguments to pass to the source during execution. - -* `file` - - (Optional) - Required. A deb package. - -* `output_file_path` - - (Optional) - Only recorded for enforce Exec. Path to an output file (that is created by this Exec) whose content will be recorded in OSPolicyResourceCompliance after a successful run. Absence or failure to read this file will result in this ExecResource being non-compliant. Output file size is limited to 100K bytes. - -* `script` - - (Optional) - An inline script. The size of the script is limited to 1024 characters. - ## Attributes Reference In addition to the arguments listed above, the following computed attributes are exported: diff --git a/website/google.erb b/website/google.erb index ce4d8b5ef7..3224197572 100644 --- a/website/google.erb +++ b/website/google.erb @@ -181,10 +181,6 @@ google_apigee_instance_attachment -
  • - google_apigee_nat_address -
    • -
  • google_apigee_organization