Fix after review

Author: ianton-ru

internal/provider/clickhouse_cluster_resource.go

@@ -51,7 +51,7 @@ type clickhouseClusterModel struct {
 	// https://github.com/doublecloud/api/blob/main/doublecloud/v1/maintenance.proto
 	// MaintenanceWindow *maintenanceWindow          `tfsdk:"maintenance_window"`
 
-	CustomCertificate types.Object `tfsdk:"custom_certificate"`
+	CustomCertificate *clickhouseCustomCertificate `tfsdk:"custom_certificate"`
 }
 
 type clickhouseClusterResources struct {
@@ -112,6 +112,40 @@ func (m *clickhouseClusterResources) convert() (*clickhouse.ClusterResources, di
 	return &r, diags
 }
 
+type clickhouseCustomCertificate struct {
+	Certificate types.String `tfsdk:"certificate"`
+	Key         types.String `tfsdk:"key"`
+	RootCA      types.String `tfsdk:"root_ca"`
+}
+
+func (cc *clickhouseCustomCertificate) convert() (*clickhouse.CustomCertificate, diag.Diagnostics) {
+	res := clickhouse.CustomCertificate{
+		Enabled: false,
+	}
+
+	var diags diag.Diagnostics
+
+	if cc != nil {
+		if !cc.Certificate.IsNull() && !cc.Key.IsNull() {
+			res.Enabled = true
+			res.Certificate = &wrappers.BytesValue{Value: []byte(cc.Certificate.ValueString())}
+			res.Key = &wrappers.BytesValue{Value: []byte(cc.Key.ValueString())}
+			if !cc.RootCA.IsNull() {
+				res.RootCa = &wrappers.BytesValue{Value: []byte(cc.RootCA.ValueString())}
+			}
+		} else {
+			if cc.Certificate.IsNull() {
+				diags.AddError("missed certificate", "for custom certificate must be both certificate and key")
+			}
+			if cc.Key.IsNull() {
+				diags.AddError("missed certificate", "for custom certificate must be both certificate and key")
+			}
+		}
+	}
+
+	return &res, diags
+}
+
 type clickhouseClusterResourcesClickhouse struct {
 	ResourcePresetId    types.String `tfsdk:"resource_preset_id"`
 	MinResourcePresetId types.String `tfsdk:"min_resource_preset_id"`
@@ -575,6 +609,10 @@ func createClickhouseClusterRequest(m *clickhouseClusterModel) (*clickhouse.Crea
 	}
 	// TODO: mw
 
+	if m.CustomCertificate != nil {
+		diags.AddError("custom_certificate exists", "custom_certificate can't be applied during cluster creation")
+	}
+
 	return rq, diags
 }
 
@@ -672,20 +710,9 @@ func updateClickhouseCluster(m *clickhouseClusterModel) (*clickhouse.UpdateClust
 		rq.Access = access
 	}
 
-	cc := m.CustomCertificate.Attributes()
-	rq.CustomCertificate = &clickhouse.CustomCertificate{
-		Enabled: false,
-	}
-	certificate, certOk := cc["certificate"]
-	key, keyOk := cc["key"]
-	rq.CustomCertificate.Enabled = certOk && keyOk
-	if rq.CustomCertificate.Enabled {
-		rq.CustomCertificate.Certificate = &wrappers.BytesValue{Value: []byte(certificate.(types.String).ValueString())}
-		rq.CustomCertificate.Key = &wrappers.BytesValue{Value: []byte(key.(types.String).ValueString())}
-		if rootCa, ok := cc["root_ca"]; ok {
-			rq.CustomCertificate.RootCa = &wrappers.BytesValue{Value: []byte(rootCa.(types.String).ValueString())}
-		}
-	}
+	cc, d := m.CustomCertificate.convert()
+	rq.CustomCertificate = cc
+	diags.Append(d...)
 
 	return rq, diags
 }
@@ -779,10 +806,10 @@ func (m *clickhouseClusterModel) parse(rs *clickhouse.Cluster) diag.Diagnostics
 	}
 
 	oldKey := ""
-	if key, ok := m.CustomCertificate.Attributes()["key"]; ok {
-		oldKey = key.String()
+	if m.CustomCertificate != nil && !m.CustomCertificate.Key.IsNull() {
+		oldKey = m.CustomCertificate.Key.String()
 	}
-	m.CustomCertificate = parseClickhouseCustomCertificate(rs.GetCustomCertificate(), oldKey, diags).convert(diags)
+	m.CustomCertificate = parseClickhouseCustomCertificate(rs.GetCustomCertificate(), oldKey, diags).convert()
 
 	// parse MW
 	return diags

internal/provider/clickhouse_data_source.go

@@ -89,24 +89,16 @@ type ClickhouseCustomCertificate struct {
 	RootCA      types.String `tfsdk:"root_ca"`
 }
 
-func (cc *ClickhouseCustomCertificate) convert(diags diag.Diagnostics) types.Object {
-	attrTypeMap := map[string]attr.Type{
-		"certificate": types.StringType,
-		"key":         types.StringType,
-		"root_ca":     types.StringType,
-	}
+func (cc *ClickhouseCustomCertificate) convert() *clickhouseCustomCertificate {
 	if cc == nil {
-		return types.ObjectNull(attrTypeMap)
+		return nil
 	}
-	res, d := types.ObjectValue(attrTypeMap,
-		map[string]attr.Value{
-			"certificate": cc.Certificate,
-			"key":         cc.Key,
-			"root_ca":     cc.RootCA,
-		},
-	)
-	diags.Append(d...)
-	return res
+	res := clickhouseCustomCertificate{
+		Certificate: cc.Certificate,
+		Key:         cc.Key,
+		RootCA:      cc.RootCA,
+	}
+	return &res
 }
 
 func (d *ClickhouseDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {

internal/provider/helpers.go

@@ -162,7 +162,7 @@ func (*clickhouseCustomCertificateValidator) ValidateObject(ctx context.Context,
 	if (certificatePresent && !keyPresent) || (!certificatePresent && keyPresent) {
 		rsp.Diagnostics.Append(validatordiag.InvalidAttributeCombinationDiagnostic(
 			req.Path,
-			`Must be both attributea "certificate" and "key"`,
+			`Must be both attributes "certificate" and "key"`,
 		))
 	}