Merge pull request #151 from schoren/resource-domain-alias

l-with · web-flow · commit 31afea8a2814 · 2026-02-16T15:49:16.000+01:00
Resource domain alias
diff --git a/api/model_alias_response.go b/api/model_alias_response.go
@@ -15,3 +15,14 @@ func (o *MailcowResponseArray) GetAliasId() (*string, error) {
 	}
 	return o.GetFinalMsgItem(2), nil
 }
+
+func (o *MailcowResponseArray) GetAliasDomainId() (*string, error) {
+	if !o.HasFinalMsgItem(0) || !o.HasFinalMsgItem(1) {
+		return nil, errors.New(fmt.Sprint("msg error: ", o.GetFinalMsgs()))
+	}
+	receipt := *o.GetFinalMsgItem(0)
+	if receipt != "aliasd_added" {
+		return nil, errors.New(fmt.Sprint("msg error: ", receipt))
+	}
+	return o.GetFinalMsgItem(1), nil
+}
diff --git a/api/model_create_request.go b/api/model_create_request.go
@@ -13,6 +13,10 @@ type MailcowCreateRequest struct {
 	ResourceName string
 }
 
+func (o *MailcowCreateRequest) GetPayload() map[string]interface{} {
+	return o.payload
+}
+
 func NewCreateAliasRequest() *MailcowCreateRequest {
 	this := MailcowCreateRequest{}
 	this.payload = make(map[string]interface{})
@@ -21,6 +25,14 @@ func NewCreateAliasRequest() *MailcowCreateRequest {
 	return &this
 }
 
+func NewCreateAliasDomainRequest() *MailcowCreateRequest {
+	this := MailcowCreateRequest{}
+	this.payload = make(map[string]interface{})
+	this.endpoint = "/api/v1/add/alias-domain"
+	this.ResourceName = "resourceAliasDomain"
+	return &this
+}
+
 func NewCreateDomainRequest() *MailcowCreateRequest {
 	this := MailcowCreateRequest{}
 	this.payload = make(map[string]interface{})
diff --git a/api/model_delete_request.go b/api/model_delete_request.go
@@ -19,6 +19,13 @@ func NewDeleteAliasRequest() *MailcowDeleteRequest {
 	return &this
 }
 
+func NewDeleteAliasDomainRequest() *MailcowDeleteRequest {
+	this := MailcowDeleteRequest{}
+	this.endpoint = "/api/v1/delete/alias-domain"
+	this.ResourceName = "resourceAliasDomain"
+	return &this
+}
+
 func NewDeleteDomainRequest() *MailcowDeleteRequest {
 	this := MailcowDeleteRequest{}
 	this.endpoint = "/api/v1/delete/domain"
diff --git a/api/model_get_request.go b/api/model_get_request.go
@@ -11,6 +11,15 @@ func (a *ApiService) MailcowGetAlias(ctx context.Context, id string) ApiMailcowG
 	}
 }
 
+func (a *ApiService) MailcowGetAliasDomain(ctx context.Context, id string) ApiMailcowGetRequest {
+	return ApiMailcowGetRequest{
+		ApiService: a,
+		ctx:        ctx,
+		endpoint:   "/api/v1/get/alias-domain/{id}",
+		id:         id,
+	}
+}
+
 func (a *ApiService) MailcowGetDomain(ctx context.Context, id string) ApiMailcowGetRequest {
 	return ApiMailcowGetRequest{
 		ApiService: a,
diff --git a/api/model_update_request.go b/api/model_update_request.go
@@ -23,6 +23,15 @@ func NewUpdateAliasRequest() *MailcowUpdateRequest {
 	return &this
 }
 
+func NewUpdateAliasDomainRequest() *MailcowUpdateRequest {
+	this := MailcowUpdateRequest{}
+	this.attr = make(map[string]interface{})
+	this.items = make([]string, 1)
+	this.endpoint = "/api/v1/edit/alias-domain"
+	this.ResourceName = "resourceAliasDomain"
+	return &this
+}
+
 func NewUpdateMailboxRequest() *MailcowUpdateRequest {
 	this := MailcowUpdateRequest{}
 	this.attr = make(map[string]interface{})
diff --git a/docs/resources/domain_alias.md b/docs/resources/domain_alias.md
@@ -0,0 +1,22 @@
+# mailcow_domain_alias (Resource)
+
+## Example Usage
+
+```terraform
+resource "mailcow_domain_alias" "example" {
+  alias_domain  = "alias-domain.tld"
+  target_domain = "target-domain.tld"
+}
+```
+
+<!-- schema generated by tfplugindocs -->
+## Schema
+
+### Required
+
+- **alias_domain** (String) Alias domain name
+- **target_domain** (String) Target domain name
+
+### Optional
+
+- **active** (Boolean) is domain alias active or not
diff --git a/examples/resources/mailcow_domain_alias/main.tf b/examples/resources/mailcow_domain_alias/main.tf
@@ -0,0 +1,4 @@
+resource "mailcow_domain_alias" "example" {
+  alias_domain  = "alias-domain.tld"
+  target_domain = "target-domain.tld"
+}
diff --git a/mailcow/data_source_domain.go b/mailcow/data_source_domain.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"reflect"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
-	"reflect"
 )
 
 func dataSourceDomain() *schema.Resource {
@@ -166,7 +167,7 @@ func dataSourceDomainRead(ctx context.Context, d *schema.ResourceData, m interfa
 			return diag.FromErr(err)
 		}
 	} else {
-		tags := make([]string, 0, 0)
+		tags := make([]string, 0)
 		err = d.Set("tags", tags)
 		if err != nil {
 			return diag.FromErr(err)
diff --git a/mailcow/helper.go b/mailcow/helper.go
@@ -2,11 +2,12 @@ package mailcow
 
 import (
 	"fmt"
-	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 	"log"
 	"math/rand"
 	"strconv"
 	"time"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
 
 func resourceDataSet(rd *schema.ResourceData, argument string, value any, elem *schema.Schema) error {
@@ -39,7 +40,7 @@ func resourceDataSet(rd *schema.ResourceData, argument string, value any, elem *
 			}
 			setValue = list
 		} else {
-			list := make([]string, 0, 0)
+			list := make([]string, 0)
 			setValue = list
 		}
 	case schema.TypeString:
diff --git a/mailcow/provider.go b/mailcow/provider.go
@@ -3,9 +3,10 @@ package mailcow
 import (
 	"context"
 	"crypto/tls"
-	"github.com/l-with/terraform-provider-mailcow/api"
 	"net/http"
 
+	"github.com/l-with/terraform-provider-mailcow/api"
+
 	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -36,6 +37,7 @@ func Provider() *schema.Provider {
 		ResourcesMap: map[string]*schema.Resource{
 			"mailcow_alias":                      resourceAlias(),
 			"mailcow_domain":                     resourceDomain(),
+			"mailcow_domain_alias":               resourceDomainAlias(),
 			"mailcow_identity_provider_keycloak": resourceIdentityProviderKeycloak(),
 			"mailcow_mailbox":                    resourceMailbox(),
 			"mailcow_dkim":                       resourceDkim(),
@@ -70,7 +72,7 @@ func providerConfigure(ctx context.Context, d *schema.ResourceData) (interface{}
 	config.AddDefaultHeader("accept", "application/json")
 	config.Debug = true
 
-	customTransport := &(*http.DefaultTransport.(*http.Transport)) // make shallow copy
+	customTransport := http.DefaultTransport.(*http.Transport).Clone() // make shallow copy
 	customTransport.TLSClientConfig = &tls.Config{InsecureSkipVerify: insecure}
 	client := &http.Client{Transport: customTransport}
 	config.HTTPClient = client
diff --git a/mailcow/resource_domain_alias.go b/mailcow/resource_domain_alias.go
@@ -0,0 +1,125 @@
+package mailcow
+
+import (
+	"context"
+	"errors"
+	"log"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	"github.com/l-with/terraform-provider-mailcow/api"
+)
+
+func resourceDomainAlias() *schema.Resource {
+	return &schema.Resource{
+		CreateContext: resourceDomainAliasCreate,
+		ReadContext:   resourceDomainAliasRead,
+		UpdateContext: resourceDomainAliasUpdate,
+		DeleteContext: resourceDomainAliasDelete,
+
+		Importer: &schema.ResourceImporter{
+			StateContext: resourceDomainAliasImport,
+		},
+
+		Schema: map[string]*schema.Schema{
+			"active": {
+				Type:        schema.TypeBool,
+				Description: "is domain alias active or not",
+				Default:     true,
+				Optional:    true,
+			},
+			"alias_domain": {
+				Type:        schema.TypeString,
+				Description: "Alias domain name",
+				Required:    true,
+				ForceNew:    true,
+			},
+			"target_domain": {
+				Type:        schema.TypeString,
+				Description: "Target domain name",
+				Required:    true,
+				ForceNew:    true,
+			},
+		},
+	}
+}
+
+func resourceDomainAliasImport(_ context.Context, d *schema.ResourceData, _ interface{}) ([]*schema.ResourceData, error) {
+	return []*schema.ResourceData{d}, nil
+}
+
+func resourceDomainAliasCreate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	c := m.(*APIClient)
+
+	log.Print("resourceDomainAliasCreate")
+
+	mailcowCreateRequest := api.NewCreateAliasDomainRequest()
+	aliasDomain := d.Get("alias_domain").(string)
+	createRequestSet(mailcowCreateRequest, resourceDomainAlias(), d, nil, nil)
+
+	request := c.client.Api.MailcowCreate(ctx).MailcowCreateRequest(*mailcowCreateRequest)
+	response, _, err := c.client.Api.MailcowCreateExecute(request)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+	err = checkResponse(response, mailcowCreateRequest.ResourceName, aliasDomain)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	id, err := response.GetAliasDomainId()
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(*id)
+	return diags
+}
+
+func resourceDomainAliasRead(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	var diags diag.Diagnostics
+	log.Print("resourceDomainAliasRead")
+
+	c := m.(*APIClient)
+	id := d.Id()
+
+	request := c.client.Api.MailcowGetAliasDomain(ctx, id)
+
+	aliasDomain, err := readRequest(request)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	if aliasDomain["alias_domain"] == nil {
+		return diag.FromErr(errors.New("domain alias not found: " + id))
+	}
+
+	err = setResourceData(resourceDomainAlias(), d, &aliasDomain, nil, nil)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	d.SetId(id)
+	return diags
+}
+
+func resourceDomainAliasUpdate(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*APIClient)
+
+	mailcowUpdateRequest := api.NewUpdateAliasDomainRequest()
+
+	err := mailcowUpdate(ctx, resourceDomainAlias(), d, nil, nil, mailcowUpdateRequest, c)
+	if err != nil {
+		return diag.FromErr(err)
+	}
+
+	return resourceDomainAliasRead(ctx, d, m)
+}
+
+func resourceDomainAliasDelete(ctx context.Context, d *schema.ResourceData, m interface{}) diag.Diagnostics {
+	c := m.(*APIClient)
+	mailcowDeleteRequest := api.NewDeleteAliasDomainRequest()
+	diags, _ := mailcowDelete(ctx, d, mailcowDeleteRequest, c)
+	return diags
+}
diff --git a/mailcow/resource_domain_alias_test.go b/mailcow/resource_domain_alias_test.go
@@ -0,0 +1,65 @@
+package mailcow
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+)
+
+func TestAccResourceDomainAlias(t *testing.T) {
+	percentS := "%s"
+	aliasDomainFmt := fmt.Sprintf("alias-%s%s.domain-%s.xyz", randomLowerCaseString(4), percentS, randomLowerCaseString(4))
+	targetDomainFmt := fmt.Sprintf("target-%s%s.domain-%s.xyz", randomLowerCaseString(4), percentS, randomLowerCaseString(4))
+
+	aliasDomain := fmt.Sprintf(aliasDomainFmt, "1")
+	targetDomain := fmt.Sprintf(targetDomainFmt, "1")
+
+	resource.UnitTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: providerFactories,
+		Steps: []resource.TestStep{
+			{
+				Config: testAccResourceDomainAlias(aliasDomain, targetDomain),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("mailcow_domain_alias.test", "alias_domain", aliasDomain),
+					resource.TestCheckResourceAttr("mailcow_domain_alias.test", "target_domain", targetDomain),
+					resource.TestCheckResourceAttr("mailcow_domain_alias.test", "active", "true"),
+				),
+			},
+			{
+				Config: testAccResourceDomainAliasInactive(aliasDomain, targetDomain),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("mailcow_domain_alias.test", "active", "false"),
+				),
+			},
+		},
+	})
+}
+
+func testAccResourceDomainAlias(aliasDomain, targetDomain string) string {
+	return fmt.Sprintf(`
+resource "mailcow_domain" "target" {
+  domain = "%s"
+}
+
+resource "mailcow_domain_alias" "test" {
+  alias_domain  = "%s"
+  target_domain = mailcow_domain.target.domain
+}
+`, targetDomain, aliasDomain)
+}
+
+func testAccResourceDomainAliasInactive(aliasDomain, targetDomain string) string {
+	return fmt.Sprintf(`
+resource "mailcow_domain" "target" {
+  domain = "%s"
+}
+
+resource "mailcow_domain_alias" "test" {
+  alias_domain  = "%s"
+  target_domain = mailcow_domain.target.domain
+  active        = false
+}
+`, targetDomain, aliasDomain)
+}
diff --git a/mailcow/resource_oauth2_client.go b/mailcow/resource_oauth2_client.go
diff --git a/mailcow/verbs.go b/mailcow/verbs.go
