update error handling and provider model

Author: maciaszczykm

internal/model/provider.go

@@ -15,79 +15,85 @@ type Provider struct {
 	CloudSettings ProviderCloudSettings `tfsdk:"cloud_settings"`
 }
 
+func (p *Provider) Attributes() console.ClusterProviderAttributes {
+	return console.ClusterProviderAttributes{
+		Name:          p.Name.ValueString(),
+		Namespace:     p.Namespace.ValueStringPointer(),
+		Cloud:         p.Cloud.ValueStringPointer(),
+		CloudSettings: p.CloudSettings.Attributes(),
+	}
+}
+
+func (p *Provider) UpdateAttributes() console.ClusterProviderUpdateAttributes {
+	return console.ClusterProviderUpdateAttributes{
+		CloudSettings: p.CloudSettings.Attributes(),
+	}
+}
+
+func (p *Provider) From(cp *console.ClusterProviderFragment) {
+	p.Id = types.StringValue(cp.ID)
+	p.Name = types.StringValue(cp.Name)
+	p.Namespace = types.StringValue(cp.Namespace)
+	p.Editable = types.BoolPointerValue(cp.Editable)
+	p.Cloud = types.StringValue(cp.Cloud)
+}
+
 type ProviderCloudSettings struct {
 	AWS   *ProviderCloudSettingsAWS   `tfsdk:"aws"`
 	Azure *ProviderCloudSettingsAzure `tfsdk:"azure"`
 	GCP   *ProviderCloudSettingsGCP   `tfsdk:"gcp"`
 }
 
+func (p *ProviderCloudSettings) Attributes() *console.CloudProviderSettingsAttributes {
+	if p.GCP != nil {
+		return &console.CloudProviderSettingsAttributes{Aws: p.AWS.Attributes()}
+	}
+
+	if p.Azure != nil {
+		return &console.CloudProviderSettingsAttributes{Azure: p.Azure.Attributes()}
+	}
+
+	if p.GCP != nil {
+		return &console.CloudProviderSettingsAttributes{Gcp: p.GCP.Attributes()}
+	}
+
+	return nil
+}
+
 type ProviderCloudSettingsAWS struct {
 	AccessKeyId     types.String `tfsdk:"access_key_id"`
 	SecretAccessKey types.String `tfsdk:"secret_access_key"`
 }
 
+func (p *ProviderCloudSettingsAWS) Attributes() *console.AwsSettingsAttributes {
+	return &console.AwsSettingsAttributes{
+		AccessKeyID:     p.AccessKeyId.ValueString(),
+		SecretAccessKey: p.SecretAccessKey.ValueString(),
+	}
+}
+
 type ProviderCloudSettingsAzure struct {
 	SubscriptionId types.String `tfsdk:"subscription_id"`
 	TenantId       types.String `tfsdk:"tenant_id"`
 	ClientId       types.String `tfsdk:"client_id"`
 	ClientSecret   types.String `tfsdk:"client_secret"`
 }
 
-type ProviderCloudSettingsGCP struct {
-	Credentials types.String `tfsdk:"credentials"`
-}
-
-func (p *Provider) CloudProviderSettingsAttributes() *console.CloudProviderSettingsAttributes {
-	if IsCloud(p.Cloud.ValueString(), CloudAWS) {
-		return &console.CloudProviderSettingsAttributes{
-			Aws: &console.AwsSettingsAttributes{
-				AccessKeyID:     p.CloudSettings.AWS.AccessKeyId.ValueString(),
-				SecretAccessKey: p.CloudSettings.AWS.SecretAccessKey.ValueString(),
-			},
-		}
-	}
-
-	if IsCloud(p.Cloud.ValueString(), CloudAzure) {
-		return &console.CloudProviderSettingsAttributes{
-			Azure: &console.AzureSettingsAttributes{
-				SubscriptionID: p.CloudSettings.Azure.SubscriptionId.ValueString(),
-				TenantID:       p.CloudSettings.Azure.TenantId.ValueString(),
-				ClientID:       p.CloudSettings.Azure.ClientId.ValueString(),
-				ClientSecret:   p.CloudSettings.Azure.ClientSecret.ValueString(),
-			},
-		}
+func (p *ProviderCloudSettingsAzure) Attributes() *console.AzureSettingsAttributes {
+	return &console.AzureSettingsAttributes{
+		SubscriptionID: p.SubscriptionId.ValueString(),
+		TenantID:       p.TenantId.ValueString(),
+		ClientID:       p.ClientId.ValueString(),
+		ClientSecret:   p.ClientSecret.ValueString(),
 	}
-
-	if IsCloud(p.Cloud.ValueString(), CloudGCP) {
-		return &console.CloudProviderSettingsAttributes{
-			Gcp: &console.GcpSettingsAttributes{
-				ApplicationCredentials: p.CloudSettings.GCP.Credentials.ValueString(),
-			},
-		}
-	}
-
-	return nil
 }
 
-func (p *Provider) CreateAttributes() console.ClusterProviderAttributes {
-	return console.ClusterProviderAttributes{
-		Name:          p.Name.ValueString(),
-		Namespace:     p.Namespace.ValueStringPointer(),
-		Cloud:         p.Cloud.ValueStringPointer(),
-		CloudSettings: p.CloudProviderSettingsAttributes(),
-	}
+type ProviderCloudSettingsGCP struct {
+	Credentials types.String `tfsdk:"credentials"`
 }
 
-func (p *Provider) UpdateAttributes() console.ClusterProviderUpdateAttributes {
-	return console.ClusterProviderUpdateAttributes{
-		CloudSettings: p.CloudProviderSettingsAttributes(),
+func (p *ProviderCloudSettingsGCP) Attributes() *console.GcpSettingsAttributes {
+	return &console.GcpSettingsAttributes{
+		ApplicationCredentials: p.Credentials.ValueString(),
 	}
 }
-
-func (p *Provider) From(cp *console.ClusterProviderFragment) {
-	p.Id = types.StringValue(cp.ID)
-	p.Name = types.StringValue(cp.Name)
-	p.Namespace = types.StringValue(cp.Namespace)
-	p.Editable = types.BoolPointerValue(cp.Editable)
-	p.Cloud = types.StringValue(cp.Cloud)
-}

internal/resource/cluster/cluster.go

@@ -316,6 +316,10 @@ func (r *clusterResource) Read(ctx context.Context, req resource.ReadRequest, re
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read cluster, got error: %s", err))
 		return
 	}
+	if result == nil || result.Cluster == nil {
+		resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find cluster, it looks like it was deleted manually"))
+		return
+	}
 
 	data.From(result.Cluster, resp.Diagnostics)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)

internal/resource/provider.go

@@ -182,7 +182,7 @@ func (r *providerResource) Create(ctx context.Context, req resource.CreateReques
 		return
 	}
 
-	result, err := r.client.CreateClusterProvider(ctx, data.CreateAttributes())
+	result, err := r.client.CreateClusterProvider(ctx, data.Attributes())
 	if err != nil {
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to create provider, got error: %s", err))
 		return
@@ -204,6 +204,10 @@ func (r *providerResource) Read(ctx context.Context, req resource.ReadRequest, r
 		resp.Diagnostics.AddError("Client Error", fmt.Sprintf("Unable to read provider, got error: %s", err))
 		return
 	}
+	if result == nil || result.ClusterProvider == nil {
+		resp.Diagnostics.AddError("Not Found", fmt.Sprintf("Unable to find provider, it looks like it was deleted manually"))
+		return
+	}
 
 	data.From(result.ClusterProvider)
 	resp.Diagnostics.Append(resp.State.Set(ctx, &data)...)