Fix: invalid memory address or nil pointer dereference

littlejo · Mar 26, 2024 · 549c417 · 549c417
1 parent 2fd33ad
commit 549c417
Show file tree

Hide file tree

Showing 7 changed files with 83 additions and 1 deletion.
diff --git a/cilium/cluster_mesh_connect.go b/cilium/cluster_mesh_connect.go
@@ -113,6 +113,10 @@ func (r *CiliumClusterMeshConnectResource) Configure(ctx context.Context, req re
 func (r *CiliumClusterMeshConnectResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
 	var data CiliumClusterMeshConnectResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = clustermesh.Parameters{
 		Writer: os.Stdout,
 	}
@@ -151,6 +155,10 @@ func (r *CiliumClusterMeshConnectResource) Read(ctx context.Context, req resourc
 		Writer: os.Stdout,
 	}
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform prior state data into the model
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)
@@ -177,6 +185,10 @@ func (r *CiliumClusterMeshConnectResource) Read(ctx context.Context, req resourc
 func (r *CiliumClusterMeshConnectResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	var data CiliumClusterMeshConnectResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = clustermesh.Parameters{
 		Writer: os.Stdout,
 	}
@@ -204,6 +216,10 @@ func (r *CiliumClusterMeshConnectResource) Update(ctx context.Context, req resou
 func (r *CiliumClusterMeshConnectResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	var data CiliumClusterMeshConnectResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = clustermesh.Parameters{
 		Writer: os.Stdout,
 	}

diff --git a/cilium/cluster_mesh_enable.go b/cilium/cluster_mesh_enable.go
@@ -124,6 +124,10 @@ func (r *CiliumClusterMeshEnableResource) Create(ctx context.Context, req resour
 		Writer: os.Stdout,
 	}
 
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	// Read Terraform plan data into the model
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
 
@@ -180,6 +184,10 @@ func (r *CiliumClusterMeshEnableResource) Read(ctx context.Context, req resource
 		Writer: os.Stdout,
 	}
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform prior state data into the model
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)

diff --git a/cilium/config.go b/cilium/config.go
@@ -110,6 +110,10 @@ func (r *CiliumConfigResource) Configure(ctx context.Context, req resource.Confi
 func (r *CiliumConfigResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
 	var data CiliumConfigResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = config.Parameters{
 		Writer: os.Stdout,
 	}
@@ -147,6 +151,10 @@ func (r *CiliumConfigResource) Create(ctx context.Context, req resource.CreateRe
 func (r *CiliumConfigResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
 	var data CiliumConfigResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = config.Parameters{
 		Writer: os.Stdout,
 	}
@@ -209,6 +217,10 @@ func (r *CiliumConfigResource) Read(ctx context.Context, req resource.ReadReques
 func (r *CiliumConfigResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	var data CiliumConfigResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = config.Parameters{
 		Writer: os.Stdout,
 	}
@@ -239,6 +251,10 @@ func (r *CiliumConfigResource) Update(ctx context.Context, req resource.UpdateRe
 func (r *CiliumConfigResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	var data CiliumConfigResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = config.Parameters{
 		Writer: os.Stdout,
 	}

diff --git a/cilium/data_helm_values.go b/cilium/data_helm_values.go
@@ -84,6 +84,11 @@ func (d *CiliumHelmValuesDataSource) Configure(ctx context.Context, req datasour
 
 func (d *CiliumHelmValuesDataSource) Read(ctx context.Context, req datasource.ReadRequest, resp *datasource.ReadResponse) {
 	var data CiliumHelmValuesDataSourceModel
+	k8sClient := d.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform configuration data into the model
 	resp.Diagnostics.Append(req.Config.Get(ctx, &data)...)
@@ -102,7 +107,7 @@ func (d *CiliumHelmValuesDataSource) Read(ctx context.Context, req datasource.Re
 		release = "cilium"
 	}
 	helmDriver := ""
-	if err := actionConfig.Init(d.client.RESTClientGetter, namespace, helmDriver, logger); err != nil {
+	if err := actionConfig.Init(k8sClient.RESTClientGetter, namespace, helmDriver, logger); err != nil {
 		return
 	}
 

diff --git a/cilium/hubble.go b/cilium/hubble.go
@@ -105,6 +105,10 @@ func (r *CiliumHubbleResource) Configure(ctx context.Context, req resource.Confi
 func (r *CiliumHubbleResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
 	var data CiliumHubbleResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = hubble.Parameters{Writer: os.Stdout}
 
 	// Read Terraform plan data into the model
@@ -151,6 +155,10 @@ func (r *CiliumHubbleResource) Read(ctx context.Context, req resource.ReadReques
 func (r *CiliumHubbleResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	var data CiliumHubbleResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = hubble.Parameters{Writer: os.Stdout}
 
 	// Read Terraform plan data into the model
@@ -177,6 +185,10 @@ func (r *CiliumHubbleResource) Update(ctx context.Context, req resource.UpdateRe
 func (r *CiliumHubbleResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	var data CiliumHubbleResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = hubble.Parameters{Writer: os.Stdout}
 
 	// Read Terraform prior state data into the model

diff --git a/cilium/install.go b/cilium/install.go
@@ -164,6 +164,10 @@ func (r *CiliumInstallResource) Create(ctx context.Context, req resource.CreateR
 	var params = install.Parameters{Writer: os.Stdout}
 	var options values.Options
 
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	// Read Terraform plan data into the model
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
 
@@ -433,6 +437,10 @@ func (r *CiliumInstallResource) Update(ctx context.Context, req resource.UpdateR
 func (r *CiliumInstallResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	var data CiliumInstallResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 	var params = install.UninstallParameters{Writer: os.Stdout}
 
 	// Read Terraform prior state data into the model

diff --git a/cilium/kubeproxy_free.go b/cilium/kubeproxy_free.go
@@ -125,6 +125,10 @@ func (r *CiliumKubeProxyDisabledResource) Configure(ctx context.Context, req res
 func (r *CiliumKubeProxyDisabledResource) Create(ctx context.Context, req resource.CreateRequest, resp *resource.CreateResponse) {
 	var data CiliumKubeProxyDisabledResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform plan data into the model
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
@@ -161,6 +165,11 @@ func (r *CiliumKubeProxyDisabledResource) Create(ctx context.Context, req resour
 
 func (r *CiliumKubeProxyDisabledResource) Read(ctx context.Context, req resource.ReadRequest, resp *resource.ReadResponse) {
 	var data CiliumKubeProxyDisabledResourceModel
+	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform prior state data into the model
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)
@@ -182,6 +191,10 @@ func (r *CiliumKubeProxyDisabledResource) Read(ctx context.Context, req resource
 func (r *CiliumKubeProxyDisabledResource) Update(ctx context.Context, req resource.UpdateRequest, resp *resource.UpdateResponse) {
 	var data CiliumKubeProxyDisabledResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform plan data into the model
 	resp.Diagnostics.Append(req.Plan.Get(ctx, &data)...)
@@ -211,6 +224,10 @@ func (r *CiliumKubeProxyDisabledResource) Update(ctx context.Context, req resour
 func (r *CiliumKubeProxyDisabledResource) Delete(ctx context.Context, req resource.DeleteRequest, resp *resource.DeleteResponse) {
 	var data CiliumKubeProxyDisabledResourceModel
 	k8sClient := r.client
+	if k8sClient == nil {
+		resp.Diagnostics.AddError("Client Error", "Unable to connect to kubernetes")
+		return
+	}
 
 	// Read Terraform prior state data into the model
 	resp.Diagnostics.Append(req.State.Get(ctx, &data)...)