fix: improve errors displayed on obs creation failure, do not fail clusterization

Author: kristina-solovyova

README.md

@@ -466,7 +466,7 @@ proxy_url = VALUE
 | <a name="input_function_app_storage_account_prefix"></a> [function\_app\_storage\_account\_prefix](#input\_function\_app\_storage\_account\_prefix) | Weka storage account name prefix | `string` | `"weka"` | no |
 | <a name="input_function_app_subnet_delegation_cidr"></a> [function\_app\_subnet\_delegation\_cidr](#input\_function\_app\_subnet\_delegation\_cidr) | Subnet delegation enables you to designate a specific subnet for an Azure PaaS service. | `string` | `"10.0.1.0/25"` | no |
 | <a name="input_function_app_subnet_delegation_id"></a> [function\_app\_subnet\_delegation\_id](#input\_function\_app\_subnet\_delegation\_id) | Required to specify if subnet\_name were used to specify pre-defined subnets for weka. Function subnet delegation requires an additional subnet, and in the case of pre-defined networking this one also should be pre-defined | `string` | `""` | no |
-| <a name="input_function_app_version"></a> [function\_app\_version](#input\_function\_app\_version) | Function app code version (hash) | `string` | `"bef288291e94411aa8c388613e355c4a"` | no |
+| <a name="input_function_app_version"></a> [function\_app\_version](#input\_function\_app\_version) | Function app code version (hash) | `string` | `"239d469255a978f32c3795d70ed84706"` | no |
 | <a name="input_get_weka_io_token"></a> [get\_weka\_io\_token](#input\_get\_weka\_io\_token) | The token to download the Weka release from get.weka.io. | `string` | `""` | no |
 | <a name="input_hotspare"></a> [hotspare](#input\_hotspare) | Number of hotspares to set on weka cluster. Refer to https://docs.weka.io/overview/ssd-capacity-management#hot-spare | `number` | `1` | no |
 | <a name="input_install_cluster_dpdk"></a> [install\_cluster\_dpdk](#input\_install\_cluster\_dpdk) | Install weka cluster with DPDK | `bool` | `true` | no |

function-app/code/functions/clusterize/clusterize.go

@@ -8,19 +8,18 @@ import (
 	"os"
 	"strconv"
 	"strings"
-	"weka-deployment/common"
-	"weka-deployment/functions/azure_functions_def"
-
-	"github.com/weka/go-cloud-lib/join"
-	"github.com/weka/go-cloud-lib/utils"
 
 	"github.com/lithammer/dedent"
-
 	"github.com/weka/go-cloud-lib/clusterize"
 	cloudCommon "github.com/weka/go-cloud-lib/common"
 	"github.com/weka/go-cloud-lib/functions_def"
+	"github.com/weka/go-cloud-lib/join"
 	"github.com/weka/go-cloud-lib/logging"
 	"github.com/weka/go-cloud-lib/protocol"
+	"github.com/weka/go-cloud-lib/utils"
+
+	"weka-deployment/common"
+	"weka-deployment/functions/azure_functions_def"
 )
 
 func GetObsScript(obsParams common.AzureObsParams) string {
@@ -105,13 +104,16 @@ func PrepareWekaObs(ctx context.Context, p *ClusterizationParams) (err error) {
 	}
 
 	if noExistingObs {
+		common.ReportMsg(ctx, p.Vm.Name, p.StateParams, "debug", "creating OBS as no access key was provided")
+
 		p.Obs.AccessKey, err = common.CreateStorageAccount(
 			ctx, p.SubscriptionId, p.ResourceGroupName, p.Location, p.Obs,
 		)
 		if err != nil {
 			err = fmt.Errorf("failed to create storage account: %w", err)
+			common.ReportMsg(ctx, p.Vm.Name, p.StateParams, "error", err.Error())
 			logger.Error().Err(err).Send()
-			return
+			return nil
 		}
 
 		if p.Obs.NetworkAccess == "Disabled" && p.CreateBlobPrivateEndpoint {
@@ -120,9 +122,10 @@ func PrepareWekaObs(ctx context.Context, p *ClusterizationParams) (err error) {
 
 			err = common.CreateStorageAccountBlobPrivateEndpoint(ctx, p.SubscriptionId, p.ResourceGroupName, p.Location, p.Obs.Name, endpointName, p.SubnetId, p.PrivateDNSZoneId)
 			if err != nil {
-				err = fmt.Errorf("failed to create private endpoint: %w", err)
+				err = fmt.Errorf("failed to create private endpoint for storage account: %w", err)
+				common.ReportMsg(ctx, p.Vm.Name, p.StateParams, "error", err.Error())
 				logger.Error().Err(err).Send()
-				return
+				return nil
 			}
 		}
 	}

variables.tf

@@ -404,13 +404,13 @@ variable "function_app_storage_account_container_prefix" {
 variable "function_app_version" {
   type        = string
   description = "Function app code version (hash)"
-  default     = "bef288291e94411aa8c388613e355c4a"
+  default     = "239d469255a978f32c3795d70ed84706"
 }
 
 variable "function_app_dist" {
   type        = string
   description = "Function app code dist"
-  default     = "release"
+  default     = "dev"
 
   validation {
     condition     = contains(["dev", "release"], var.function_app_dist)
@@ -500,12 +500,12 @@ variable "tiering_enable_ssd_percent" {
 variable "tiering_obs_container_name" {
   type        = string
   default     = ""
-  description = "Name of existing obs conatiner name"
+  description = "Name of existing obs container name."
 }
 
 variable "tiering_blob_obs_access_key" {
   type        = string
-  description = "The access key of the existing Blob object store container."
+  description = "The access key of the existing Blob object store container. If not provided, new obs will be created with given name (tiering_obs_name)."
   sensitive   = true
   default     = ""
 }