diff --git a/google-beta/provider_compute_gen.go b/google-beta/provider_compute_gen.go index 5f59563514..c157c9c209 100644 --- a/google-beta/provider_compute_gen.go +++ b/google-beta/provider_compute_gen.go @@ -35,6 +35,7 @@ var GeneratedComputeResourcesMap = map[string]*schema.Resource{ "google_compute_interconnect_attachment": resourceComputeInterconnectAttachment(), "google_compute_network": resourceComputeNetwork(), "google_compute_network_endpoint_group": resourceComputeNetworkEndpointGroup(), + "google_compute_node_group": resourceComputeNodeGroup(), "google_compute_node_template": resourceComputeNodeTemplate(), "google_compute_region_autoscaler": resourceComputeRegionAutoscaler(), "google_compute_region_disk": resourceComputeRegionDisk(), diff --git a/google-beta/resource_compute_node_group.go b/google-beta/resource_compute_node_group.go new file mode 100644 index 0000000000..3808c77b63 --- /dev/null +++ b/google-beta/resource_compute_node_group.go @@ -0,0 +1,379 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// 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" + "strconv" + "time" + + "github.com/hashicorp/terraform/helper/schema" + "google.golang.org/api/compute/v1" +) + +func resourceComputeNodeGroup() *schema.Resource { + return &schema.Resource{ + Create: resourceComputeNodeGroupCreate, + Read: resourceComputeNodeGroupRead, + Update: resourceComputeNodeGroupUpdate, + Delete: resourceComputeNodeGroupDelete, + + Importer: &schema.ResourceImporter{ + State: resourceComputeNodeGroupImport, + }, + + Timeouts: &schema.ResourceTimeout{ + Create: schema.DefaultTimeout(240 * time.Second), + Update: schema.DefaultTimeout(240 * time.Second), + Delete: schema.DefaultTimeout(240 * time.Second), + }, + + Schema: map[string]*schema.Schema{ + "node_template": { + Type: schema.TypeString, + Required: true, + DiffSuppressFunc: compareSelfLinkOrResourceName, + }, + "size": { + Type: schema.TypeInt, + Required: true, + ForceNew: true, + }, + "description": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "name": { + Type: schema.TypeString, + Optional: true, + ForceNew: true, + }, + "zone": { + Type: schema.TypeString, + Computed: true, + Optional: true, + ForceNew: true, + DiffSuppressFunc: compareSelfLinkOrResourceName, + }, + "creation_timestamp": { + Type: schema.TypeString, + Computed: true, + }, + "project": { + Type: schema.TypeString, + Optional: true, + Computed: true, + ForceNew: true, + }, + "self_link": { + Type: schema.TypeString, + Computed: true, + }, + }, + } +} + +func resourceComputeNodeGroupCreate(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + + obj := make(map[string]interface{}) + descriptionProp, err := expandComputeNodeGroupDescription(d.Get("description"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("description"); !isEmptyValue(reflect.ValueOf(descriptionProp)) && (ok || !reflect.DeepEqual(v, descriptionProp)) { + obj["description"] = descriptionProp + } + nameProp, err := expandComputeNodeGroupName(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 + } + nodeTemplateProp, err := expandComputeNodeGroupNodeTemplate(d.Get("node_template"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("node_template"); !isEmptyValue(reflect.ValueOf(nodeTemplateProp)) && (ok || !reflect.DeepEqual(v, nodeTemplateProp)) { + obj["nodeTemplate"] = nodeTemplateProp + } + sizeProp, err := expandComputeNodeGroupSize(d.Get("size"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("size"); ok || !reflect.DeepEqual(v, sizeProp) { + obj["size"] = sizeProp + } + zoneProp, err := expandComputeNodeGroupZone(d.Get("zone"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("zone"); !isEmptyValue(reflect.ValueOf(zoneProp)) && (ok || !reflect.DeepEqual(v, zoneProp)) { + obj["zone"] = zoneProp + } + + url, err := replaceVars(d, config, "https://www.googleapis.com/compute/beta/projects/{{project}}/zones/{{zone}}/nodeGroups?initialNodeCount={{size}}") + if err != nil { + return err + } + + log.Printf("[DEBUG] Creating new NodeGroup: %#v", obj) + res, err := sendRequestWithTimeout(config, "POST", url, obj, d.Timeout(schema.TimeoutCreate)) + if err != nil { + return fmt.Errorf("Error creating NodeGroup: %s", err) + } + + // Store the ID now + id, err := replaceVars(d, config, "{{name}}") + if err != nil { + return fmt.Errorf("Error constructing id: %s", err) + } + d.SetId(id) + + project, err := getProject(d, config) + if err != nil { + return err + } + op := &compute.Operation{} + err = Convert(res, op) + if err != nil { + return err + } + + waitErr := computeOperationWaitTime( + config.clientCompute, op, project, "Creating NodeGroup", + int(d.Timeout(schema.TimeoutCreate).Minutes())) + + if waitErr != nil { + // The resource didn't actually create + d.SetId("") + return fmt.Errorf("Error waiting to create NodeGroup: %s", waitErr) + } + + log.Printf("[DEBUG] Finished creating NodeGroup %q: %#v", d.Id(), res) + + return resourceComputeNodeGroupRead(d, meta) +} + +func resourceComputeNodeGroupRead(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + + url, err := replaceVars(d, config, "https://www.googleapis.com/compute/beta/projects/{{project}}/zones/{{zone}}/nodeGroups/{{name}}") + if err != nil { + return err + } + + res, err := sendRequest(config, "GET", url, nil) + if err != nil { + return handleNotFoundError(err, d, fmt.Sprintf("ComputeNodeGroup %q", d.Id())) + } + + project, err := getProject(d, config) + if err != nil { + return err + } + if err := d.Set("project", project); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + + if err := d.Set("creation_timestamp", flattenComputeNodeGroupCreationTimestamp(res["creationTimestamp"], d)); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + if err := d.Set("description", flattenComputeNodeGroupDescription(res["description"], d)); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + if err := d.Set("name", flattenComputeNodeGroupName(res["name"], d)); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + if err := d.Set("node_template", flattenComputeNodeGroupNodeTemplate(res["nodeTemplate"], d)); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + if err := d.Set("size", flattenComputeNodeGroupSize(res["size"], d)); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + if err := d.Set("zone", flattenComputeNodeGroupZone(res["zone"], d)); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + if err := d.Set("self_link", ConvertSelfLinkToV1(res["selfLink"].(string))); err != nil { + return fmt.Errorf("Error reading NodeGroup: %s", err) + } + + return nil +} + +func resourceComputeNodeGroupUpdate(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + + d.Partial(true) + + if d.HasChange("node_template") { + obj := make(map[string]interface{}) + nodeTemplateProp, err := expandComputeNodeGroupNodeTemplate(d.Get("node_template"), d, config) + if err != nil { + return err + } else if v, ok := d.GetOkExists("node_template"); !isEmptyValue(reflect.ValueOf(v)) && (ok || !reflect.DeepEqual(v, nodeTemplateProp)) { + obj["nodeTemplate"] = nodeTemplateProp + } + + url, err := replaceVars(d, config, "https://www.googleapis.com/compute/beta/projects/{{project}}/zones/{{zone}}/nodeGroups/{{name}}/setNodeTemplate") + if err != nil { + return err + } + res, err := sendRequestWithTimeout(config, "POST", url, obj, d.Timeout(schema.TimeoutUpdate)) + if err != nil { + return fmt.Errorf("Error updating NodeGroup %q: %s", d.Id(), err) + } + + project, err := getProject(d, config) + if err != nil { + return err + } + op := &compute.Operation{} + err = Convert(res, op) + if err != nil { + return err + } + + err = computeOperationWaitTime( + config.clientCompute, op, project, "Updating NodeGroup", + int(d.Timeout(schema.TimeoutUpdate).Minutes())) + + if err != nil { + return err + } + + d.SetPartial("node_template") + } + + d.Partial(false) + + return resourceComputeNodeGroupRead(d, meta) +} + +func resourceComputeNodeGroupDelete(d *schema.ResourceData, meta interface{}) error { + config := meta.(*Config) + + url, err := replaceVars(d, config, "https://www.googleapis.com/compute/beta/projects/{{project}}/zones/{{zone}}/nodeGroups/{{name}}") + if err != nil { + return err + } + + var obj map[string]interface{} + log.Printf("[DEBUG] Deleting NodeGroup %q", d.Id()) + res, err := sendRequestWithTimeout(config, "DELETE", url, obj, d.Timeout(schema.TimeoutDelete)) + if err != nil { + return handleNotFoundError(err, d, "NodeGroup") + } + + project, err := getProject(d, config) + if err != nil { + return err + } + op := &compute.Operation{} + err = Convert(res, op) + if err != nil { + return err + } + + err = computeOperationWaitTime( + config.clientCompute, op, project, "Deleting NodeGroup", + int(d.Timeout(schema.TimeoutDelete).Minutes())) + + if err != nil { + return err + } + + log.Printf("[DEBUG] Finished deleting NodeGroup %q: %#v", d.Id(), res) + return nil +} + +func resourceComputeNodeGroupImport(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) { + config := meta.(*Config) + if err := parseImportId([]string{"projects/(?P[^/]+)/zones/(?P[^/]+)/nodeGroups/(?P[^/]+)", "(?P[^/]+)/(?P[^/]+)/(?P[^/]+)", "(?P[^/]+)"}, d, config); err != nil { + return nil, err + } + + // Replace import id for the resource id + id, err := replaceVars(d, config, "{{name}}") + if err != nil { + return nil, fmt.Errorf("Error constructing id: %s", err) + } + d.SetId(id) + + return []*schema.ResourceData{d}, nil +} + +func flattenComputeNodeGroupCreationTimestamp(v interface{}, d *schema.ResourceData) interface{} { + return v +} + +func flattenComputeNodeGroupDescription(v interface{}, d *schema.ResourceData) interface{} { + return v +} + +func flattenComputeNodeGroupName(v interface{}, d *schema.ResourceData) interface{} { + return v +} + +func flattenComputeNodeGroupNodeTemplate(v interface{}, d *schema.ResourceData) interface{} { + if v == nil { + return v + } + return ConvertSelfLinkToV1(v.(string)) +} + +func flattenComputeNodeGroupSize(v interface{}, d *schema.ResourceData) interface{} { + // Handles the string fixed64 format + if strVal, ok := v.(string); ok { + if intVal, err := strconv.ParseInt(strVal, 10, 64); err == nil { + return intVal + } // let terraform core handle it if we can't convert the string to an int. + } + return v +} + +func flattenComputeNodeGroupZone(v interface{}, d *schema.ResourceData) interface{} { + if v == nil { + return v + } + return NameFromSelfLinkStateFunc(v) +} + +func expandComputeNodeGroupDescription(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { + return v, nil +} + +func expandComputeNodeGroupName(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { + return v, nil +} + +func expandComputeNodeGroupNodeTemplate(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { + f, err := parseRegionalFieldValue("nodeTemplates", v.(string), "project", "region", "zone", d, config, true) + if err != nil { + return nil, fmt.Errorf("Invalid value for node_template: %s", err) + } + return f.RelativeLink(), nil +} + +func expandComputeNodeGroupSize(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { + return v, nil +} + +func expandComputeNodeGroupZone(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) { + f, err := parseGlobalFieldValue("zones", v.(string), "project", d, config, true) + if err != nil { + return nil, fmt.Errorf("Invalid value for zone: %s", err) + } + return f.RelativeLink(), nil +} diff --git a/google-beta/resource_compute_node_group_generated_test.go b/google-beta/resource_compute_node_group_generated_test.go new file mode 100644 index 0000000000..57499183be --- /dev/null +++ b/google-beta/resource_compute_node_group_generated_test.go @@ -0,0 +1,97 @@ +// ---------------------------------------------------------------------------- +// +// *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +// +// ---------------------------------------------------------------------------- +// +// 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/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccComputeNodeGroup_nodeGroupBasicExample(t *testing.T) { + t.Parallel() + + context := map[string]interface{}{ + "random_suffix": acctest.RandString(10), + } + + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeNodeGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeNodeGroup_nodeGroupBasicExample(context), + }, + { + ResourceName: "google_compute_node_group.nodes", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccComputeNodeGroup_nodeGroupBasicExample(context map[string]interface{}) string { + return Nprintf(` +data "google_compute_node_types" "central1a" { + zone = "us-central1-a" +} + +resource "google_compute_node_template" "soletenant-tmpl" { + name = "soletenant-tmpl-%{random_suffix}" + region = "us-central1" + node_type = "${data.google_compute_node_types.central1a.names[0]}" +} + +resource "google_compute_node_group" "nodes" { + name = "soletenant-group-%{random_suffix}" + zone = "us-central1-a" + description = "example google_compute_node_group for Terraform Google Provider" + + size = 0 + node_template = "${google_compute_node_template.soletenant-tmpl.self_link}" +} +`, context) +} + +func testAccCheckComputeNodeGroupDestroy(s *terraform.State) error { + for name, rs := range s.RootModule().Resources { + if rs.Type != "google_compute_node_group" { + continue + } + if strings.HasPrefix(name, "data.") { + continue + } + + config := testAccProvider.Meta().(*Config) + + url, err := replaceVarsForTest(rs, "https://www.googleapis.com/compute/beta/projects/{{project}}/zones/{{zone}}/nodeGroups/{{name}}") + if err != nil { + return err + } + + _, err = sendRequest(config, "GET", url, nil) + if err == nil { + return fmt.Errorf("ComputeNodeGroup still exists at %s", url) + } + } + + return nil +} diff --git a/google-beta/resource_compute_node_group_test.go b/google-beta/resource_compute_node_group_test.go new file mode 100644 index 0000000000..b743ee02a2 --- /dev/null +++ b/google-beta/resource_compute_node_group_test.go @@ -0,0 +1,115 @@ +package google + +import ( + "fmt" + "testing" + + "strings" + "time" + + "github.com/hashicorp/terraform/helper/acctest" + "github.com/hashicorp/terraform/helper/resource" + "github.com/hashicorp/terraform/terraform" +) + +func TestAccComputeNodeGroup_updateNodeTemplate(t *testing.T) { + t.Parallel() + + groupName := acctest.RandomWithPrefix("group-") + tmplPrefix := acctest.RandomWithPrefix("tmpl-") + + var timeCreated time.Time + resource.Test(t, resource.TestCase{ + PreCheck: func() { testAccPreCheck(t) }, + Providers: testAccProviders, + CheckDestroy: testAccCheckComputeNodeGroupDestroy, + Steps: []resource.TestStep{ + { + Config: testAccComputeNodeGroup_updateNodeTemplate(groupName, tmplPrefix, "tmpl1"), + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeNodeGroupCreationTimeBefore(&timeCreated), + ), + }, + { + ResourceName: "google_compute_node_group.nodes", + ImportState: true, + ImportStateVerify: true, + }, + { + Config: testAccComputeNodeGroup_updateNodeTemplate(groupName, tmplPrefix, "tmpl2"), + Check: resource.ComposeTestCheckFunc( + testAccCheckComputeNodeGroupCreationTimeBefore(&timeCreated), + ), + }, + { + ResourceName: "google_compute_node_group.nodes", + ImportState: true, + ImportStateVerify: true, + }, + }, + }) +} + +func testAccCheckComputeNodeGroupCreationTimeBefore(prevTimeCreated *time.Time) resource.TestCheckFunc { + return func(s *terraform.State) error { + for name, rs := range s.RootModule().Resources { + if rs.Type != "google_compute_node_group" { + continue + } + if strings.HasPrefix(name, "data.") { + continue + } + + timestampRaw, ok := rs.Primary.Attributes["creation_timestamp"] + if !ok { + return fmt.Errorf("expected creation_timestamp to be set in node group's state") + } + creationTimestamp, err := time.Parse(time.RFC3339Nano, timestampRaw) + if err != nil { + return fmt.Errorf("unexpected error while parsing creation_timestamp: %v", err) + } + + if prevTimeCreated.IsZero() { + *prevTimeCreated = creationTimestamp + return nil + } + + if creationTimestamp.After(prevTimeCreated.Add(time.Millisecond * 100)) { + return fmt.Errorf( + "Creation timestamp %q was after expected previous time of creation %q", + timestampRaw, prevTimeCreated.Format(time.RFC3339Nano)) + } + } + + return nil + } +} + +func testAccComputeNodeGroup_updateNodeTemplate(groupName, tmplPrefix, tmplToUse string) string { + return fmt.Sprintf(` +data "google_compute_node_types" "central1a" { + zone = "us-central1-a" +} + +resource "google_compute_node_template" "tmpl1" { + name = "%s-first" + region = "us-central1" + node_type = "${data.google_compute_node_types.central1a.names[0]}" +} + +resource "google_compute_node_template" "tmpl2" { + name = "%s-second" + region = "us-central1" + node_type = "${data.google_compute_node_types.central1a.names[0]}" +} + +resource "google_compute_node_group" "nodes" { + name = "%s" + zone = "us-central1-a" + description = "example google_compute_node_group for Terraform Google Provider" + + size = 1 + node_template = "${google_compute_node_template.%s.self_link}" +} +`, tmplPrefix, tmplPrefix, groupName, tmplToUse) +} diff --git a/website/docs/r/compute_node_group.html.markdown b/website/docs/r/compute_node_group.html.markdown new file mode 100644 index 0000000000..b507a3fada --- /dev/null +++ b/website/docs/r/compute_node_group.html.markdown @@ -0,0 +1,129 @@ +--- +# ---------------------------------------------------------------------------- +# +# *** AUTO GENERATED CODE *** AUTO GENERATED CODE *** +# +# ---------------------------------------------------------------------------- +# +# 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. +# +# ---------------------------------------------------------------------------- +layout: "google" +page_title: "Google: google_compute_node_group" +sidebar_current: "docs-google-compute-node-group" +description: |- + Represents a NodeGroup resource to manage a group of sole-tenant nodes. +--- + +# google\_compute\_node\_group + +Represents a NodeGroup resource to manage a group of sole-tenant nodes. + + +To get more information about NodeGroup, see: + +* [API documentation](https://cloud.google.com/compute/docs/reference/rest/v1/nodeGroups) +* How-to Guides + * [Sole-Tenant Nodes](https://cloud.google.com/compute/docs/nodes/) + +~> **Warning:** Due to limitations of the API, Terraform cannot update the +number of nodes in a node group and changes to node group size either +through Terraform config or through external changes will cause +Terraform to delete and recreate the node group. + +
+ + Open in Cloud Shell + +
+## Example Usage - Node Group Basic + + +```hcl +data "google_compute_node_types" "central1a" { + zone = "us-central1-a" +} + +resource "google_compute_node_template" "soletenant-tmpl" { + name = "soletenant-tmpl" + region = "us-central1" + node_type = "${data.google_compute_node_types.central1a.names[0]}" +} + +resource "google_compute_node_group" "nodes" { + name = "soletenant-group" + zone = "us-central1-a" + description = "example google_compute_node_group for Terraform Google Provider" + + size = 0 + node_template = "${google_compute_node_template.soletenant-tmpl.self_link}" +} +``` + +## Argument Reference + +The following arguments are supported: + + +* `node_template` - + (Required) + The URL of the node template to which this node group belongs. + +* `size` - + (Required) + The total number of nodes in the node group. + + +- - - + + +* `description` - + (Optional) + An optional textual description of the resource. + +* `name` - + (Optional) + Name of the resource. + +* `zone` - + (Optional) + Zone where this node group is located +* `project` - (Optional) The ID of the project in which the resource belongs. + If it is not provided, the provider project is used. + + +## Attributes Reference + +In addition to the arguments listed above, the following computed attributes are exported: + + +* `creation_timestamp` - + Creation timestamp in RFC3339 text format. +* `self_link` - The URI of the created resource. + + +## Timeouts + +This resource provides the following +[Timeouts](/docs/configuration/resources.html#timeouts) configuration options: + +- `create` - Default is 4 minutes. +- `update` - Default is 4 minutes. +- `delete` - Default is 4 minutes. + +## Import + +NodeGroup can be imported using any of these accepted formats: + +``` +$ terraform import google_compute_node_group.default projects/{{project}}/zones/{{zone}}/nodeGroups/{{name}} +$ terraform import google_compute_node_group.default {{project}}/{{zone}}/{{name}} +$ terraform import google_compute_node_group.default {{name}} +``` + +-> If you're importing a resource with beta features, make sure to include `-provider=google-beta` +as an argument so that Terraform uses the correct provider to import your resource. diff --git a/website/docs/r/compute_node_template.html.markdown b/website/docs/r/compute_node_template.html.markdown index aa45c629c0..5be3c183e1 100644 --- a/website/docs/r/compute_node_template.html.markdown +++ b/website/docs/r/compute_node_template.html.markdown @@ -23,7 +23,7 @@ description: |- Represents a NodeTemplate resource. Node templates specify properties for creating sole-tenant nodes, such as node type, vCPU and memory -requirments, node affinity labels, and region. +requirments, node affinity labels, and region. To get more information about NodeTemplate, see: diff --git a/website/google.erb b/website/google.erb index f7ad97fa86..35569a0bfc 100644 --- a/website/google.erb +++ b/website/google.erb @@ -443,6 +443,10 @@ google_compute_interconnect_attachment + > + google_compute_node_group + + > google_compute_node_template