Skip to content

Commit 3de0653

Browse files
Merge pull request #1105 from RafaySystems/RC-44138-fix
RC-44138 Fixed NPE
2 parents b97b1a6 + 998fed8 commit 3de0653

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

rafay/resource_import_cluster.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -310,8 +310,14 @@ func resourceImportClusterCreate(ctx context.Context, d *schema.ResourceData, m
310310
}
311311
project_id := p.ID
312312

313+
proxyCfg := expandProxyConfigImportCluster(d.Get("proxy_config"))
314+
if proxyCfg == nil {
315+
// Cases where no proxy config is provided
316+
proxyCfg = &models.ProxyConfig{}
317+
}
318+
313319
//create imported cluster
314-
_, err = cluster.NewImportClusterWithProvisionParams(d.Get("clustername").(string), d.Get("blueprint").(string), d.Get("location").(string), project_id, d.Get("blueprint_version").(string), d.Get("provision_environment").(string), d.Get("kubernetes_provider").(string), *expandProxyConfigImportCluster(d.Get("proxy_config")))
320+
_, err = cluster.NewImportClusterWithProvisionParams(d.Get("clustername").(string), d.Get("blueprint").(string), d.Get("location").(string), project_id, d.Get("blueprint_version").(string), d.Get("provision_environment").(string), d.Get("kubernetes_provider").(string), *proxyCfg)
315321
if err != nil {
316322
log.Printf("create import cluster failed to create (check parameters passed in), error %s", err.Error())
317323
return diag.FromErr(err)

0 commit comments

Comments
 (0)