Machine image updates (#3873) (#2637)

Co-authored-by: Cameron Thornton <[email protected]>
Signed-off-by: Modular Magician <[email protected]>

Co-authored-by: Cameron Thornton <[email protected]>

Author: modular-magician

.changelog/3873.txt

@@ -0,0 +1,18 @@
+```release-note:enhancement
+compute: added storage_locations & cmek fields to `google_compute_machine_image` resource
+```
+```release-note:note
+compute: updated `google_compute_machine_image` resource to complete once the Image is ready.
+```
+```release-note:new-resource
+`google_compute_instance_from_machine_image`
+```
+```release-note:new-resource
+`google_compute_machine_image_iam_member`
+```
+```release-note:new-resource
+`google_compute_machine_image_iam_binding`
+```
+```release-note:new-resource
+`google_compute_machine_image_iam_policy`
+```

google-beta/field_helpers.go

@@ -76,6 +76,10 @@ func ParseInstanceTemplateFieldValue(instanceTemplate string, d TerraformResourc
 	return parseGlobalFieldValue("instanceTemplates", instanceTemplate, "project", d, config, false)
 }
 
+func ParseMachineImageFieldValue(machineImage string, d TerraformResourceData, config *Config) (*GlobalFieldValue, error) {
+	return parseGlobalFieldValue("machineImages", machineImage, "project", d, config, false)
+}
+
 func ParseSecurityPolicyFieldValue(securityPolicy string, d TerraformResourceData, config *Config) (*GlobalFieldValue, error) {
 	return parseGlobalFieldValue("securityPolicies", securityPolicy, "project", d, config, true)
 }

google-beta/iam_compute_machine_image.go

@@ -0,0 +1,202 @@
+// ----------------------------------------------------------------------------
+//
+//     ***     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"
+
+	"github.com/hashicorp/errwrap"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"google.golang.org/api/cloudresourcemanager/v1"
+)
+
+var ComputeMachineImageIamSchema = map[string]*schema.Schema{
+	"project": {
+		Type:     schema.TypeString,
+		Computed: true,
+		Optional: true,
+		ForceNew: true,
+	},
+	"machine_image": {
+		Type:             schema.TypeString,
+		Required:         true,
+		ForceNew:         true,
+		DiffSuppressFunc: compareSelfLinkOrResourceName,
+	},
+}
+
+type ComputeMachineImageIamUpdater struct {
+	project      string
+	machineImage string
+	d            *schema.ResourceData
+	Config       *Config
+}
+
+func ComputeMachineImageIamUpdaterProducer(d *schema.ResourceData, config *Config) (ResourceIamUpdater, error) {
+	values := make(map[string]string)
+
+	project, _ := getProject(d, config)
+	if project != "" {
+		if err := d.Set("project", project); err != nil {
+			return nil, fmt.Errorf("Error setting project: %s", err)
+		}
+	}
+	values["project"] = project
+	if v, ok := d.GetOk("machine_image"); ok {
+		values["machine_image"] = v.(string)
+	}
+
+	// We may have gotten either a long or short name, so attempt to parse long name if possible
+	m, err := getImportIdQualifiers([]string{"projects/(?P<project>[^/]+)/global/machineImages/(?P<machine_image>[^/]+)", "(?P<project>[^/]+)/(?P<machine_image>[^/]+)", "(?P<machine_image>[^/]+)"}, d, config, d.Get("machine_image").(string))
+	if err != nil {
+		return nil, err
+	}
+
+	for k, v := range m {
+		values[k] = v
+	}
+
+	u := &ComputeMachineImageIamUpdater{
+		project:      values["project"],
+		machineImage: values["machine_image"],
+		d:            d,
+		Config:       config,
+	}
+
+	if err := d.Set("project", u.project); err != nil {
+		return nil, fmt.Errorf("Error setting project: %s", err)
+	}
+	if err := d.Set("machine_image", u.GetResourceId()); err != nil {
+		return nil, fmt.Errorf("Error setting machine_image: %s", err)
+	}
+
+	return u, nil
+}
+
+func ComputeMachineImageIdParseFunc(d *schema.ResourceData, config *Config) error {
+	values := make(map[string]string)
+
+	project, _ := getProject(d, config)
+	if project != "" {
+		values["project"] = project
+	}
+
+	m, err := getImportIdQualifiers([]string{"projects/(?P<project>[^/]+)/global/machineImages/(?P<machine_image>[^/]+)", "(?P<project>[^/]+)/(?P<machine_image>[^/]+)", "(?P<machine_image>[^/]+)"}, d, config, d.Id())
+	if err != nil {
+		return err
+	}
+
+	for k, v := range m {
+		values[k] = v
+	}
+
+	u := &ComputeMachineImageIamUpdater{
+		project:      values["project"],
+		machineImage: values["machine_image"],
+		d:            d,
+		Config:       config,
+	}
+	if err := d.Set("machine_image", u.GetResourceId()); err != nil {
+		return fmt.Errorf("Error setting machine_image: %s", err)
+	}
+	d.SetId(u.GetResourceId())
+	return nil
+}
+
+func (u *ComputeMachineImageIamUpdater) GetResourceIamPolicy() (*cloudresourcemanager.Policy, error) {
+	url, err := u.qualifyMachineImageUrl("getIamPolicy")
+	if err != nil {
+		return nil, err
+	}
+
+	project, err := getProject(u.d, u.Config)
+	if err != nil {
+		return nil, err
+	}
+	var obj map[string]interface{}
+	url, err = addQueryParams(url, map[string]string{"optionsRequestedPolicyVersion": fmt.Sprintf("%d", iamPolicyVersion)})
+	if err != nil {
+		return nil, err
+	}
+
+	userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
+	if err != nil {
+		return nil, err
+	}
+
+	policy, err := sendRequest(u.Config, "GET", project, url, userAgent, obj)
+	if err != nil {
+		return nil, errwrap.Wrapf(fmt.Sprintf("Error retrieving IAM policy for %s: {{err}}", u.DescribeResource()), err)
+	}
+
+	out := &cloudresourcemanager.Policy{}
+	err = Convert(policy, out)
+	if err != nil {
+		return nil, errwrap.Wrapf("Cannot convert a policy to a resource manager policy: {{err}}", err)
+	}
+
+	return out, nil
+}
+
+func (u *ComputeMachineImageIamUpdater) SetResourceIamPolicy(policy *cloudresourcemanager.Policy) error {
+	json, err := ConvertToMap(policy)
+	if err != nil {
+		return err
+	}
+
+	obj := make(map[string]interface{})
+	obj["policy"] = json
+
+	url, err := u.qualifyMachineImageUrl("setIamPolicy")
+	if err != nil {
+		return err
+	}
+	project, err := getProject(u.d, u.Config)
+	if err != nil {
+		return err
+	}
+
+	userAgent, err := generateUserAgentString(u.d, u.Config.userAgent)
+	if err != nil {
+		return err
+	}
+
+	_, err = sendRequestWithTimeout(u.Config, "POST", project, url, userAgent, obj, u.d.Timeout(schema.TimeoutCreate))
+	if err != nil {
+		return errwrap.Wrapf(fmt.Sprintf("Error setting IAM policy for %s: {{err}}", u.DescribeResource()), err)
+	}
+
+	return nil
+}
+
+func (u *ComputeMachineImageIamUpdater) qualifyMachineImageUrl(methodIdentifier string) (string, error) {
+	urlTemplate := fmt.Sprintf("{{ComputeBasePath}}%s/%s", fmt.Sprintf("projects/%s/global/machineImages/%s", u.project, u.machineImage), methodIdentifier)
+	url, err := replaceVars(u.d, u.Config, urlTemplate)
+	if err != nil {
+		return "", err
+	}
+	return url, nil
+}
+
+func (u *ComputeMachineImageIamUpdater) GetResourceId() string {
+	return fmt.Sprintf("projects/%s/global/machineImages/%s", u.project, u.machineImage)
+}
+
+func (u *ComputeMachineImageIamUpdater) GetMutexKey() string {
+	return fmt.Sprintf("iam-compute-machineimage-%s", u.GetResourceId())
+}
+
+func (u *ComputeMachineImageIamUpdater) DescribeResource() string {
+	return fmt.Sprintf("compute machineimage %q", u.GetResourceId())
+}