Merge pull request #861 from ovh/dev/aamstutz/fix-instance

fix: Correctly handle SSH keys in ovh_cloud_project_instance resource

Author: amstuta

ovh/resource_cloud_project_instance.go

@@ -141,6 +141,7 @@ func resourceCloudProjectInstance() *schema.Resource {
 						},
 					},
 				},
+				ExactlyOneOf: []string{"ssh_key", "ssh_key_create"},
 			},
 			"ssh_key_create": {
 				Type:        schema.TypeSet,
@@ -265,13 +266,12 @@ func resourceCloudProjectInstanceCreate(ctx context.Context, d *schema.ResourceD
 		return diag.Errorf("calling %s with params %v:\n\t %q", endpoint, params, err)
 	}
 
-	instanceID, err := waitForCloudProjectOperation(ctx, config.OVHClient, serviceName, r.Id)
+	instanceID, err := waitForCloudProjectOperation(ctx, config.OVHClient, serviceName, r.Id, "instance#create")
 	if err != nil {
 		return diag.Errorf("timeout instance creation: %s", err)
 	}
 
 	d.SetId(instanceID)
-	d.Set("region", region)
 
 	return resourceCloudProjectInstanceRead(ctx, d, meta)
 }

ovh/resource_cloud_project_instance_test.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"testing"
 
+	"github.com/hashicorp/terraform-plugin-testing/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-testing/helper/resource"
 )
 
@@ -104,3 +105,62 @@ func TestAccCloudProjectInstance_basic(t *testing.T) {
 		},
 	})
 }
+
+func TestAccCloudProjectInstance_withSSHKeyCreate(t *testing.T) {
+	serviceName := os.Getenv("OVH_CLOUD_PROJECT_SERVICE_TEST")
+	region := os.Getenv("OVH_CLOUD_PROJECT_REGION_TEST")
+	flavor, image, err := getFlavorAndImage(serviceName, region)
+	if err != nil {
+		t.Fatalf("failed to retrieve a flavor and an image: %s", err)
+	}
+
+	sshKeyName := acctest.RandomWithPrefix(test_prefix)
+
+	var testCreateInstance = fmt.Sprintf(`
+			resource "ovh_cloud_project_instance" "instance" {
+				service_name = "%s"
+				region = "%s"
+				billing_period = "hourly"
+				boot_from {
+					image_id = "%s"
+				}
+				flavor {
+					flavor_id = "%s"
+				}
+				name = "TestInstance"
+				ssh_key_create {
+					name = "%s"
+					public_key = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQC9xPpdqP3sx2H+gcBm65tJEaUbuifQ1uGkgrWtNY0PRKNNPdy+3yoVOtxk6Vjo4YZ0EU/JhmQfnrK7X7Q5vhqYxmozi0LiTRt0BxgqHJ+4hWTWMIOgr+C2jLx7ZsCReRk+fy5AHr6h0PHQEuXVLXeUy/TDyuY2JPtUZ5jcqvLYgQ== my-key"
+				}
+				network {
+					public = true
+				}
+			}
+		`,
+		serviceName,
+		region,
+		image,
+		flavor,
+		sshKeyName)
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() {
+			testAccPreCheckCloud(t)
+			testAccCheckCloudProjectExists(t)
+		},
+		Providers: testAccProviders,
+		Steps: []resource.TestStep{
+			{
+				Config: testCreateInstance,
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttrSet("ovh_cloud_project_instance.instance", "id"),
+					resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "flavor_name", "b2-7"),
+					resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "flavor_id", flavor),
+					resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "image_id", image),
+					resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "region", region),
+					resource.TestCheckResourceAttr("ovh_cloud_project_instance.instance", "name", "TestInstance"),
+				),
+			},
+		},
+	})
+}

ovh/resource_cloud_project_loadbalancer.go

@@ -97,7 +97,7 @@ func (r *cloudProjectLoadbalancerResource) Create(ctx context.Context, req resou
 	}
 
 	// Wait for operation to be completed
-	resourceID, err := waitForCloudProjectOperation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), operation.Id)
+	resourceID, err := waitForCloudProjectOperation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), operation.Id, "")
 	if err != nil {
 		resp.Diagnostics.AddError("error waiting for operation", err.Error())
 	}

ovh/resource_cloud_project_region_network.go

@@ -83,7 +83,7 @@ func (r *cloudProjectRegionNetworkResource) Create(ctx context.Context, req reso
 	}
 
 	// Wait for operation to complete
-	networkID, err := waitForCloudProjectOperation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), operation.Id)
+	networkID, err := waitForCloudProjectOperation(ctx, r.config.OVHClient, data.ServiceName.ValueString(), operation.Id, "")
 	if err != nil {
 		resp.Diagnostics.AddError(fmt.Sprintf("error waiting for operation %s", operation.Id), err.Error())
 		return

ovh/types_cloud.go

@@ -69,9 +69,10 @@ type CloudProjectOperationResponse struct {
 
 type CloudProjectSubOperation struct {
 	ResourceId *string `json:"resourceId"`
+	Action     string  `json:"action"`
 }
 
-func waitForCloudProjectOperation(ctx context.Context, c *ovh.Client, serviceName, operationId string) (string, error) {
+func waitForCloudProjectOperation(ctx context.Context, c *ovh.Client, serviceName, operationId, actionType string) (string, error) {
 	endpoint := fmt.Sprintf("/cloud/project/%s/operation/%s", url.PathEscape(serviceName), url.PathEscape(operationId))
 	resourceID := ""
 	err := retry.RetryContext(ctx, 10*time.Minute, func() *retry.RetryError {
@@ -86,6 +87,13 @@ func waitForCloudProjectOperation(ctx context.Context, c *ovh.Client, serviceNam
 		case "completed":
 			if ro.ResourceId != nil {
 				resourceID = *ro.ResourceId
+			} else if len(ro.SubOperations) > 0 && actionType != "" {
+				for _, subOp := range ro.SubOperations {
+					if subOp.Action == actionType && subOp.ResourceId != nil {
+						resourceID = *subOp.ResourceId
+						break
+					}
+				}
 			} else if len(ro.SubOperations) > 0 && ro.SubOperations[0].ResourceId != nil {
 				resourceID = *ro.SubOperations[0].ResourceId
 			}

ovh/types_cloud_project_instance.go

@@ -175,6 +175,9 @@ func GetGroup(i interface{}) *Group {
 	groupOut := Group{}
 
 	groupSet := i.(*schema.Set).List()
+	if len(groupSet) == 0 {
+		return nil
+	}
 	for _, group := range groupSet {
 		mapping := group.(map[string]interface{})
 		groupOut.GroupId = mapping["id"].(string)
@@ -189,6 +192,9 @@ func GetSshKey(i interface{}) *SshKey {
 	sshOutput := SshKey{}
 
 	sshSet := i.(*schema.Set).List()
+	if len(sshSet) == 0 {
+		return nil
+	}
 	for _, ssh := range sshSet {
 		mapping := ssh.(map[string]interface{})
 		sshOutput.Name = mapping["name"].(string)
@@ -210,7 +216,7 @@ func GetSshKeyCreate(i interface{}) *SshKeyCreate {
 	for _, ssh := range sshCreateSet {
 		mapping := ssh.(map[string]interface{})
 		sshCreateOutput.Name = mapping["name"].(string)
-		sshCreateOutput.Name = mapping["public_key"].(string)
+		sshCreateOutput.PublicKey = mapping["public_key"].(string)
 	}
 
 	return &sshCreateOutput