Allow to specify image with version for all services

docs/resources/clickhouse.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/couchdb.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/elasticsearch.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/mariadb.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/mongo.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/mysql.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/nats.md

@@ -44,6 +44,7 @@ resource "dokku_nats" "demo" {
 
 - `config_options` (String) Config options to create service with
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format
 
 ## Import
 

docs/resources/postgres.md

@@ -41,6 +41,7 @@ resource "dokku_postgres" "demo" {
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format
 
 ## Import
 

docs/resources/rabbitmq.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/redis.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

docs/resources/rethinkdb.md

@@ -22,3 +22,4 @@ description: |-
 ### Optional
 
 - `expose` (String) Port or IP:Port to expose service on
+- `image` (String) Image to use in `image:version` format

provider/services/clickhouse_resource.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 
 	dokkuclient "github.com/aliksend/terraform-provider-dokku/provider/dokku_client"
@@ -33,6 +34,7 @@ type clickhouseResource struct {
 
 type clickhouseResourceModel struct {
 	ServiceName types.String `tfsdk:"service_name"`
+	Image       types.String `tfsdk:"image"`
 	Expose      types.String `tfsdk:"expose"`
 }
 
@@ -65,6 +67,16 @@ func (r *clickhouseResource) Schema(_ context.Context, _ resource.SchemaRequest,
 					stringvalidator.RegexMatches(regexp.MustCompile(`^[a-z][a-z0-9-]*$`), "invalid service_name"),
 				},
 			},
+			"image": schema.StringAttribute{
+				Optional:    true,
+				Description: "Image to use in `image:version` format",
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				Validators: []validator.String{
+					stringvalidator.RegexMatches(regexp.MustCompile(`^(.+):(.+)$`), "invalid image"),
+				},
+			},
 			"expose": schema.StringAttribute{
 				Optional:    true,
 				Description: "Port or IP:Port to expose service on",
@@ -115,6 +127,8 @@ func (r *clickhouseResource) Read(ctx context.Context, req resource.ReadRequest,
 	} else {
 		state.Expose = basetypes.NewStringNull()
 	}
+	infoVersion := info["Version"]
+	state.Image = basetypes.NewStringValue(infoVersion)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)
@@ -145,7 +159,19 @@ func (r *clickhouseResource) Create(ctx context.Context, req resource.CreateRequ
 		return
 	}
 
-	err = r.client.SimpleServiceCreate(ctx, "clickhouse", plan.ServiceName.ValueString())
+	var args []string
+
+	if !plan.Image.IsNull() {
+		r := regexp.MustCompile(`^(.+):(.+)$`)
+		m := r.FindStringSubmatch(plan.Image.ValueString())
+		if len(m) == 3 {
+			args = append(args, fmt.Sprintf("--image %s", m[1]), fmt.Sprintf("--image-version %s", m[2]))
+		} else {
+			resp.Diagnostics.AddError("Invalid image format", "Invalid image format")
+		}
+	}
+
+	err = r.client.SimpleServiceCreate(ctx, "clickhouse", plan.ServiceName.ValueString(), args...)
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to create clickhouse service", "Unable to create clickhouse service. "+err.Error())
 		return

provider/services/couchdb_resource.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 
 	dokkuclient "github.com/aliksend/terraform-provider-dokku/provider/dokku_client"
@@ -33,6 +34,7 @@ type couchDBResource struct {
 
 type couchDBResourceModel struct {
 	ServiceName types.String `tfsdk:"service_name"`
+	Image       types.String `tfsdk:"image"`
 	Expose      types.String `tfsdk:"expose"`
 }
 
@@ -65,6 +67,16 @@ func (r *couchDBResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 					stringvalidator.RegexMatches(regexp.MustCompile(`^[a-z][a-z0-9-]*$`), "invalid service_name"),
 				},
 			},
+			"image": schema.StringAttribute{
+				Optional:    true,
+				Description: "Image to use in `image:version` format",
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				Validators: []validator.String{
+					stringvalidator.RegexMatches(regexp.MustCompile(`^(.+):(.+)$`), "invalid image"),
+				},
+			},
 			"expose": schema.StringAttribute{
 				Optional:    true,
 				Description: "Port or IP:Port to expose service on",
@@ -115,6 +127,8 @@ func (r *couchDBResource) Read(ctx context.Context, req resource.ReadRequest, re
 	} else {
 		state.Expose = basetypes.NewStringNull()
 	}
+	infoVersion := info["Version"]
+	state.Image = basetypes.NewStringValue(infoVersion)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)
@@ -145,6 +159,18 @@ func (r *couchDBResource) Create(ctx context.Context, req resource.CreateRequest
 		return
 	}
 
+	var args []string
+
+	if !plan.Image.IsNull() {
+		r := regexp.MustCompile(`^(.+):(.+)$`)
+		m := r.FindStringSubmatch(plan.Image.ValueString())
+		if len(m) == 3 {
+			args = append(args, fmt.Sprintf("--image %s", m[1]), fmt.Sprintf("--image-version %s", m[2]))
+		} else {
+			resp.Diagnostics.AddError("Invalid image format", "Invalid image format")
+		}
+	}
+
 	err = r.client.SimpleServiceCreate(ctx, "couchdb", plan.ServiceName.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to create couchDB service", "Unable to create couchDB service. "+err.Error())

provider/services/elasticsearch_resource.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 
 	dokkuclient "github.com/aliksend/terraform-provider-dokku/provider/dokku_client"
@@ -33,6 +34,7 @@ type elasticsearchResource struct {
 
 type elasticsearchResourceModel struct {
 	ServiceName types.String `tfsdk:"service_name"`
+	Image       types.String `tfsdk:"image"`
 	Expose      types.String `tfsdk:"expose"`
 }
 
@@ -65,6 +67,16 @@ func (r *elasticsearchResource) Schema(_ context.Context, _ resource.SchemaReque
 					stringvalidator.RegexMatches(regexp.MustCompile(`^[a-z][a-z0-9-]*$`), "invalid service_name"),
 				},
 			},
+			"image": schema.StringAttribute{
+				Optional:    true,
+				Description: "Image to use in `image:version` format",
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				Validators: []validator.String{
+					stringvalidator.RegexMatches(regexp.MustCompile(`^(.+):(.+)$`), "invalid image"),
+				},
+			},
 			"expose": schema.StringAttribute{
 				Optional:    true,
 				Description: "Port or IP:Port to expose service on",
@@ -115,6 +127,8 @@ func (r *elasticsearchResource) Read(ctx context.Context, req resource.ReadReque
 	} else {
 		state.Expose = basetypes.NewStringNull()
 	}
+	infoVersion := info["Version"]
+	state.Image = basetypes.NewStringValue(infoVersion)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)
@@ -145,6 +159,18 @@ func (r *elasticsearchResource) Create(ctx context.Context, req resource.CreateR
 		return
 	}
 
+	var args []string
+
+	if !plan.Image.IsNull() {
+		r := regexp.MustCompile(`^(.+):(.+)$`)
+		m := r.FindStringSubmatch(plan.Image.ValueString())
+		if len(m) == 3 {
+			args = append(args, fmt.Sprintf("--image %s", m[1]), fmt.Sprintf("--image-version %s", m[2]))
+		} else {
+			resp.Diagnostics.AddError("Invalid image format", "Invalid image format")
+		}
+	}
+
 	err = r.client.SimpleServiceCreate(ctx, "elasticsearch", plan.ServiceName.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to create elasticsearch service", "Unable to create elasticsearch service. "+err.Error())

provider/services/mariadb_resource.go

@@ -2,6 +2,7 @@ package services
 
 import (
 	"context"
+	"fmt"
 	"regexp"
 
 	dokkuclient "github.com/aliksend/terraform-provider-dokku/provider/dokku_client"
@@ -33,6 +34,7 @@ type mariaDBResource struct {
 
 type mariaDBResourceModel struct {
 	ServiceName types.String `tfsdk:"service_name"`
+	Image       types.String `tfsdk:"image"`
 	Expose      types.String `tfsdk:"expose"`
 }
 
@@ -65,6 +67,16 @@ func (r *mariaDBResource) Schema(_ context.Context, _ resource.SchemaRequest, re
 					stringvalidator.RegexMatches(regexp.MustCompile(`^[a-z][a-z0-9-]*$`), "invalid service_name"),
 				},
 			},
+			"image": schema.StringAttribute{
+				Optional:    true,
+				Description: "Image to use in `image:version` format",
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				Validators: []validator.String{
+					stringvalidator.RegexMatches(regexp.MustCompile(`^(.+):(.+)$`), "invalid image"),
+				},
+			},
 			"expose": schema.StringAttribute{
 				Optional:    true,
 				Description: "Port or IP:Port to expose service on",
@@ -115,6 +127,8 @@ func (r *mariaDBResource) Read(ctx context.Context, req resource.ReadRequest, re
 	} else {
 		state.Expose = basetypes.NewStringNull()
 	}
+	infoVersion := info["Version"]
+	state.Image = basetypes.NewStringValue(infoVersion)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)
@@ -145,6 +159,18 @@ func (r *mariaDBResource) Create(ctx context.Context, req resource.CreateRequest
 		return
 	}
 
+	var args []string
+
+	if !plan.Image.IsNull() {
+		r := regexp.MustCompile(`^(.+):(.+)$`)
+		m := r.FindStringSubmatch(plan.Image.ValueString())
+		if len(m) == 3 {
+			args = append(args, fmt.Sprintf("--image %s", m[1]), fmt.Sprintf("--image-version %s", m[2]))
+		} else {
+			resp.Diagnostics.AddError("Invalid image format", "Invalid image format")
+		}
+	}
+
 	err = r.client.SimpleServiceCreate(ctx, "mariadb", plan.ServiceName.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to create mariaDB service", "Unable to create mariaDB service. "+err.Error())

provider/services/mongo_resource.go

@@ -34,6 +34,7 @@ type mongoResource struct {
 
 type mongoResourceModel struct {
 	ServiceName types.String `tfsdk:"service_name"`
+	Image       types.String `tfsdk:"image"`
 	Expose      types.String `tfsdk:"expose"`
 }
 
@@ -66,6 +67,16 @@ func (r *mongoResource) Schema(_ context.Context, _ resource.SchemaRequest, resp
 					stringvalidator.RegexMatches(regexp.MustCompile(`^[a-z][a-z0-9-]*$`), "invalid service_name"),
 				},
 			},
+			"image": schema.StringAttribute{
+				Optional:    true,
+				Description: "Image to use in `image:version` format",
+				PlanModifiers: []planmodifier.String{
+					stringplanmodifier.RequiresReplace(),
+				},
+				Validators: []validator.String{
+					stringvalidator.RegexMatches(regexp.MustCompile(`^(.+):(.+)$`), "invalid image"),
+				},
+			},
 			"expose": schema.StringAttribute{
 				Optional:    true,
 				Description: "Port or IP:Port to expose service on",
@@ -116,6 +127,8 @@ func (r *mongoResource) Read(ctx context.Context, req resource.ReadRequest, resp
 	} else {
 		state.Expose = basetypes.NewStringNull()
 	}
+	infoVersion := info["Version"]
+	state.Image = basetypes.NewStringValue(infoVersion)
 
 	// Set refreshed state
 	diags = resp.State.Set(ctx, &state)
@@ -146,6 +159,18 @@ func (r *mongoResource) Create(ctx context.Context, req resource.CreateRequest,
 		return
 	}
 
+	var args []string
+
+	if !plan.Image.IsNull() {
+		r := regexp.MustCompile(`^(.+):(.+)$`)
+		m := r.FindStringSubmatch(plan.Image.ValueString())
+		if len(m) == 3 {
+			args = append(args, fmt.Sprintf("--image %s", m[1]), fmt.Sprintf("--image-version %s", m[2]))
+		} else {
+			resp.Diagnostics.AddError("Invalid image format", "Invalid image format")
+		}
+	}
+
 	err = r.client.SimpleServiceCreate(ctx, "mongo", plan.ServiceName.ValueString())
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to create mongo service", "Unable to create mongo service. "+err.Error())