Merge branch 'master' into fix-rdb-private-network-endpoint

Author: Monitob

docs/resources/baremetal_server.md

@@ -111,6 +111,21 @@ resource "scaleway_baremetal_server" "base" {
 }
 ```
 
+### Without install config
+
+```hcl
+data "scaleway_baremetal_offer" "my_offer" {
+  zone = "fr-par-2"
+  name = "EM-B112X-SSD"
+}
+
+resource "scaleway_baremetal_server" "base" {
+  zone	                   = "fr-par-2"
+  offer                    = data.scaleway_baremetal_offer.my_offer.offer_id
+  install_config_afterward = true
+}
+```
+
 ## Arguments Reference
 
 The following arguments are supported:
@@ -130,6 +145,7 @@ The following arguments are supported:
 - `service_password` - (Optional) Password used for the service to install. May be required depending on used os.
 - `reinstall_on_config_changes` - (Optional) If True, this boolean allows to reinstall the server on install config changes.
   ~> **Important:** Updates to `ssh_key_ids`, `user`, `password`, `service_user` or `service_password` will not take effect on the server, it requires to reinstall it. To do so please set 'reinstall_on_config_changes' argument to true.
+- `install_config_afterward` - (Optional) If True, this boolean allows to create a server without the install config if you want to provide it later.
 - `name` - (Optional) The name of the server.
 - `hostname` - (Optional) The hostname of the server.
 - `description` - (Optional) A description for the server.

scaleway/resource_baremetal_server.go

@@ -61,7 +61,7 @@ func resourceScalewayBaremetalServer() *schema.Resource {
 			},
 			"os": {
 				Type:             schema.TypeString,
-				Required:         true,
+				Optional:         true,
 				Description:      "The base image of the server",
 				DiffSuppressFunc: diffSuppressFuncLocality,
 				ValidateFunc:     validationUUIDorUUIDWithLocality(),
@@ -77,7 +77,7 @@ func resourceScalewayBaremetalServer() *schema.Resource {
 					Type:         schema.TypeString,
 					ValidateFunc: validationUUID(),
 				},
-				Required: true,
+				Optional: true,
 				Description: `Array of SSH key IDs allowed to SSH to the server
 
 **NOTE** : If you are attempting to update your SSH key IDs, it will induce the reinstall of your server. 
@@ -113,6 +113,12 @@ If this behaviour is wanted, please set 'reinstall_on_ssh_key_changes' argument
 				Default:     false,
 				Description: "If True, this boolean allows to reinstall the server on SSH key IDs, user or password changes",
 			},
+			"install_config_afterward": {
+				Type:        schema.TypeBool,
+				Optional:    true,
+				Default:     false,
+				Description: "If True, this boolean allows to create a server without the install config if you want to provide it later",
+			},
 			"description": {
 				Type:         schema.TypeString,
 				Optional:     true,
@@ -278,8 +284,11 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
 		}
 		offerID = newZonedID(zone, o.ID)
 	}
-	if diags := validateInstallConfig(ctx, d, meta); len(diags) > 0 {
-		return diags
+
+	if !d.Get("install_config_afterward").(bool) {
+		if diags := validateInstallConfig(ctx, d, meta); len(diags) > 0 {
+			return diags
+		}
 	}
 
 	server, err := baremetalAPI.CreateServer(&baremetal.CreateServerRequest{
@@ -301,19 +310,26 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	_, err = baremetalAPI.InstallServer(&baremetal.InstallServerRequest{
-		Zone:            server.Zone,
-		ServerID:        server.ID,
-		OsID:            expandZonedID(d.Get("os")).ID,
-		Hostname:        expandStringWithDefault(d.Get("hostname"), server.Name),
-		SSHKeyIDs:       expandStrings(d.Get("ssh_key_ids")),
-		User:            expandStringPtr(d.Get("user")),
-		Password:        expandStringPtr(d.Get("password")),
-		ServiceUser:     expandStringPtr(d.Get("service_user")),
-		ServicePassword: expandStringPtr(d.Get("service_password")),
-	}, scw.WithContext(ctx))
-	if err != nil {
-		return diag.FromErr(err)
+	if !d.Get("install_config_afterward").(bool) {
+		_, err = baremetalAPI.InstallServer(&baremetal.InstallServerRequest{
+			Zone:            server.Zone,
+			ServerID:        server.ID,
+			OsID:            expandZonedID(d.Get("os")).ID,
+			Hostname:        expandStringWithDefault(d.Get("hostname"), server.Name),
+			SSHKeyIDs:       expandStrings(d.Get("ssh_key_ids")),
+			User:            expandStringPtr(d.Get("user")),
+			Password:        expandStringPtr(d.Get("password")),
+			ServiceUser:     expandStringPtr(d.Get("service_user")),
+			ServicePassword: expandStringPtr(d.Get("service_password")),
+		}, scw.WithContext(ctx))
+		if err != nil {
+			return diag.FromErr(err)
+		}
+
+		_, err = waitForBaremetalServerInstall(ctx, baremetalAPI, zone, server.ID, d.Timeout(schema.TimeoutCreate))
+		if err != nil {
+			return diag.FromErr(err)
+		}
 	}
 
 	options, optionsExist := d.GetOk("options")
@@ -357,11 +373,6 @@ func resourceScalewayBaremetalServerCreate(ctx context.Context, d *schema.Resour
 		}
 	}
 
-	_, err = waitForBaremetalServerInstall(ctx, baremetalAPI, zone, server.ID, d.Timeout(schema.TimeoutCreate))
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
 	return resourceScalewayBaremetalServerRead(ctx, d, meta)
 }
 

scaleway/resource_baremetal_server_test.go

@@ -161,6 +161,39 @@ func TestAccScalewayBaremetalServer_RequiredInstallConfig(t *testing.T) {
 	})
 }
 
+func TestAccScalewayBaremetalServer_WithoutInstallConfig(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayBaremetalServerDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: `
+					data "scaleway_baremetal_offer" "my_offer" {
+					  zone = "fr-par-2"
+					  name = "EM-B112X-SSD"
+					}
+
+					resource "scaleway_baremetal_server" "base" {
+					  name 			             = "TestAccScalewayBaremetalServer_WithoutInstallConfig"
+                      zone     			         = "fr-par-2"
+					  offer     				 = data.scaleway_baremetal_offer.my_offer.offer_id
+					  install_config_afterward   = true
+					}`,
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayBaremetalServerExists(tt, "scaleway_baremetal_server.base"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "name", "TestAccScalewayBaremetalServer_WithoutInstallConfig"),
+					resource.TestCheckResourceAttr("scaleway_baremetal_server.base", "offer_id", "fr-par-2/a5065ba4-dde2-45f3-adec-1ebbb27b766b"),
+					resource.TestCheckNoResourceAttr("scaleway_baremetal_server.base", "os"),
+				),
+			},
+		},
+	})
+}
+
 func TestAccScalewayBaremetalServer_CreateServerWithOption(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()

scaleway/resource_lb_certificate.go

@@ -193,21 +193,6 @@ func resourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceDa
 		return diag.FromErr(err)
 	}
 
-	// check if cert is on error state
-	if certificate.Status == lbSDK.CertificateStatusError {
-		return diag.Diagnostics{
-			diag.Diagnostic{
-				Severity: diag.Error,
-				Summary:  fmt.Sprintf("certificate %s with error state", certificate.ID),
-			},
-		}
-	}
-
-	_, err = waitForLBCertificate(ctx, lbAPI, zone, certificate.ID, d.Timeout(schema.TimeoutRead))
-	if err != nil {
-		return diag.FromErr(err)
-	}
-
 	_ = d.Set("lb_id", newZonedIDString(zone, certificate.LB.ID))
 	_ = d.Set("name", certificate.Name)
 	_ = d.Set("common_name", certificate.CommonName)
@@ -217,7 +202,20 @@ func resourceScalewayLbCertificateRead(ctx context.Context, d *schema.ResourceDa
 	_ = d.Set("not_valid_after", flattenTime(certificate.NotValidAfter))
 	_ = d.Set("status", certificate.Status)
 
-	return nil
+	diags := diag.Diagnostics(nil)
+
+	if certificate.Status == lbSDK.CertificateStatusError {
+		errDetails := ""
+		if certificate.StatusDetails != nil {
+			errDetails = *certificate.StatusDetails
+		}
+		diags = append(diags, diag.Diagnostic{
+			Severity: diag.Warning,
+			Summary:  fmt.Sprintf("certificate %s with error state", certificate.ID),
+			Detail:   errDetails,
+		})
+	}
+	return diags
 }
 
 func resourceScalewayLbCertificateUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {